rev 4254 - trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:38:08 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:37:48 +0000 (Sun, 30 Jul 2006)
New Revision: 4254
Modified:
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-07-30 01:37:09 UTC (rev 4253)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-07-30 01:37:48 UTC (rev 4254)
@@ -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.
--- config.h.in
+++ config.h.in
@@ -300,22 +300,22 @@
@@ -3881,7 +3919,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59d.
++# Generated by GNU Autoconf 2.60.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4163,8 +4201,8 @@
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells which exist, to save several forks.
-+ if test -f "$as_shell" &&
++ # Try only shells that exist, to save several forks.
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -4422,7 +4460,7 @@
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
@@ -5579,7 +5617,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5598,7 +5636,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -5624,7 +5662,15 @@
} >&5
-@@ -1291,7 +1926,7 @@
+@@ -1280,7 +1915,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1291,7 +1925,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -5633,7 +5679,18 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1326,8 +1961,8 @@
+@@ -1313,9 +1947,7 @@
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+- # Get rid of the leading space.
+- ac_sep=" "
++ ac_configure_args="$ac_configure_args '$ac_arg'"
+ ;;
+ esac
+ done
+@@ -1326,8 +1958,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
@@ -5644,7 +5701,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1340,20 +1975,34 @@
+@@ -1340,20 +1972,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -5689,13 +5746,16 @@
echo
cat <<\_ASBOX
-@@ -1364,22 +2013,22 @@
+@@ -1364,22 +2010,28 @@
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -5715,11 +5775,14 @@
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
-@@ -1391,26 +2040,24 @@
+@@ -1391,26 +2043,24 @@
## ----------- ##
_ASBOX
echo
@@ -5751,7 +5814,7 @@
# Predefined preprocessor variables.
-@@ -1441,14 +2088,17 @@
+@@ -1441,14 +2091,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -5776,7 +5839,7 @@
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1464,8 +2114,8 @@
+@@ -1464,8 +2117,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -5787,7 +5850,7 @@
esac
fi
else
-@@ -1477,12 +2127,11 @@
+@@ -1477,12 +2130,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -5803,7 +5866,7 @@
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1507,8 +2156,7 @@
+@@ -1507,8 +2159,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -5813,7 +5876,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1525,12 +2173,6 @@
+@@ -1525,12 +2176,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -5826,7 +5889,7 @@
-@@ -1547,110 +2189,165 @@
+@@ -1547,110 +2192,165 @@
@@ -6044,7 +6107,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1660,17 +2357,17 @@
+@@ -1660,17 +2360,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6065,7 +6128,7 @@
am__api_version="1.9"
-@@ -1692,8 +2389,8 @@
+@@ -1692,8 +2392,8 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -6076,7 +6139,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1715,7 +2412,7 @@
+@@ -1715,7 +2415,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6085,7 +6148,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -1734,21 +2431,22 @@
+@@ -1734,21 +2434,22 @@
;;
esac
done
@@ -6113,7 +6176,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1762,8 +2460,8 @@
+@@ -1762,8 +2463,8 @@
if test -z "$kde_save_INSTALL_given" ; then
# OK, user hasn't given any INSTALL, autoconf found one for us
# now we test, if it supports the -p flag
@@ -6124,7 +6187,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1775,8 +2473,8 @@
+@@ -1775,8 +2476,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6135,7 +6198,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1786,8 +2484,8 @@
+@@ -1786,8 +2487,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6146,7 +6209,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1829,8 +2527,8 @@
+@@ -1829,8 +2530,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6157,7 +6220,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1881,8 +2579,8 @@
+@@ -1881,8 +2582,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
@@ -6168,7 +6231,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1895,41 +2593,44 @@
+@@ -1895,54 +2596,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6203,10 +6266,11 @@
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6214,21 +6278,27 @@
+SHELL = /bin/sh
all:
- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo 'ac_maketemp=X"$(MAKE)"'
++ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-+if test "$ac_maketemp" != X ; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
-@@ -1937,12 +2638,12 @@
+- eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+- eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++ *@@@%%%=?*=@@@%%%*)
++ eval ac_cv_prog_make_${ac_make}_set=yes;;
++ *)
++ eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
rm -f conftest.make
fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
@@ -6240,7 +6310,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2013,8 +2714,8 @@
+@@ -2013,8 +2717,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
@@ -6251,7 +6321,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2027,32 +2728,34 @@
+@@ -2027,32 +2731,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6293,7 +6363,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2065,27 +2768,41 @@
+@@ -2065,27 +2771,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6342,7 +6412,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2105,6 +2822,31 @@
+@@ -2105,6 +2825,31 @@
@@ -6374,7 +6444,7 @@
unset CDPATH
-@@ -2123,14 +2865,14 @@
+@@ -2123,14 +2868,14 @@
if test "x$prefix" = "xNONE"; then
@@ -6392,7 +6462,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2173,8 +2915,8 @@
+@@ -2173,8 +2918,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6403,7 +6473,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2185,8 +2927,8 @@
+@@ -2185,8 +2930,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6414,7 +6484,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2195,14 +2937,14 @@
+@@ -2195,14 +2940,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -6432,7 +6502,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2245,8 +2987,8 @@
+@@ -2245,8 +2990,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6443,7 +6513,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2257,8 +2999,8 @@
+@@ -2257,8 +3002,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6454,7 +6524,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2281,16 +3023,16 @@
+@@ -2281,16 +3026,16 @@
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
@@ -6477,7 +6547,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2303,13 +3045,13 @@
+@@ -2303,13 +3048,13 @@
@@ -6495,7 +6565,7 @@
val=
-@@ -2326,11 +3068,11 @@
+@@ -2326,11 +3071,11 @@
@@ -6509,7 +6579,7 @@
am_make=${MAKE-make}
-@@ -2340,8 +3082,8 @@
+@@ -2340,8 +3085,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6520,7 +6590,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2368,15 +3110,15 @@
+@@ -2368,15 +3113,15 @@
fi
@@ -6541,7 +6611,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2396,10 +3138,9 @@
+@@ -2396,10 +3141,9 @@
@@ -6554,7 +6624,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2419,18 +3160,18 @@
+@@ -2419,18 +3163,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -6580,7 +6650,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2439,12 +3180,12 @@
+@@ -2439,12 +3183,12 @@
else
kde_use_strict_options="no"
@@ -6597,7 +6667,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2453,20 +3194,21 @@
+@@ -2453,20 +3197,21 @@
else
kde_use_warnings="yes"
@@ -6624,7 +6694,7 @@
CFLAGS=" $CFLAGS"
-@@ -2478,8 +3220,8 @@
+@@ -2478,8 +3223,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
@@ -6635,7 +6705,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2492,32 +3234,34 @@
+@@ -2492,32 +3237,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6677,7 +6747,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2530,36 +3274,51 @@
+@@ -2530,36 +3277,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6739,7 +6809,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2572,74 +3331,34 @@
+@@ -2572,74 +3334,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6759,16 +6829,12 @@
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
+-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-fi
+-
+-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
@@ -6801,11 +6867,15 @@
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
--else
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
@@ -6823,7 +6893,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2653,7 +3372,7 @@
+@@ -2653,7 +3375,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6832,7 +6902,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2664,6 +3383,7 @@
+@@ -2664,6 +3386,7 @@
fi
done
done
@@ -6840,7 +6910,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2681,22 +3401,23 @@
+@@ -2681,22 +3404,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6871,7 +6941,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2709,36 +3430,38 @@
+@@ -2709,36 +3433,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6918,7 +6988,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2751,29 +3474,45 @@
+@@ -2751,29 +3477,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6970,7 +7040,7 @@
fi
fi
-@@ -2786,25 +3525,38 @@
+@@ -2786,21 +3528,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -6980,53 +7050,41 @@
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-
-+
-+# List of possible output files. We want to start from the most likely,
-+# but we have to check foo.exe before foo, because Cygwin `test -f' looks
-+# also for foo.exe. b.out is created by i960 compilers.
-+# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
-+# But we are not allowed to rm a.*, and we do not want always remove
-+# conftest.*, so we will list them literally, when appropriate.
-+ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
-+
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+rm -f $ac_outfiles conftest.*
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2820,51 +3572,40 @@
- return 0;
- }
- _ACEOF
-+
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files $ac_outfiles"
-+
-+# The following tests should remove their output except files matching conftest.*.
+@@ -2825,46 +3581,70 @@
# 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.
@@ -7035,9 +7093,34 @@
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+- (eval $ac_link_default) 2>&5
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort. b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++ esac
++done
++rm -f $ac_rmfiles
+
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link_default") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -7050,7 +7133,12 @@
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ for ac_file in $ac_outfiles a.* conftest.* NO
++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# 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
do
test -f "$ac_file" || continue
case $ac_file in
@@ -7058,47 +7146,47 @@
- ;;
- conftest.$ac_ext )
- # This is the source file.
-- ;;
-- [ab].out )
-- # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-- *.* )
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
-- break;;
-- * )
-- break;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) break;;
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ fi
++ # We set ac_cv_exeext here because the later test for it is not
++ # safe: cross compilers may not add the suffix if given an `-o'
++ # argument, so we may need to know it at that point already.
++ # Even if this section looks crufty: it has the advantage of
++ # actually working.
+ break;;
+ * )
+ break;;
esac
done
-+if test "$ac_file" = NO; then
-+ { { echo "$as_me:$LINENO: error: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no output file found
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
++test "$ac_cv_exeext" = no && ac_cv_exeext=
+
-+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2876,14 +3617,12 @@
- { (exit 77); exit 77; }; }
+@@ -2877,19 +3657,23 @@
fi
--ac_exeext=$ac_cv_exeext
+ ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run. If not, either
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+
+-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -7108,7 +7196,19 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -2908,83 +3647,84 @@
+ if { ac_try='./$ac_file'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -2908,22 +3692,27 @@
fi
fi
fi
@@ -7117,20 +7217,20 @@
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
--ac_clean_files=$ac_clean_files_save
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
++# Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-+# Clean up; list also $ac_file, in case it matched a wildcard entry.
-+rm -f $ac_outfiles $ac_file
-
+-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
@@ -7138,100 +7238,59 @@
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if test "${ac_cv_exeext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-- # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in conftest.exe conftest conftest.*; do
-- test -f "$ac_file" || continue
-- case $ac_file in
+@@ -2934,9 +3723,8 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
-- break;;
-- * ) break;;
-- esac
--done
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable),
-+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+ # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
-+ for ac_file in conftest.exe conftest conftest.* NO; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ break;;
-+ * ) break;;
-+ esac
-+ done
-+ if test "$ac_file" = NO; then
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ # Clean up; list also $ac_file, in case it matched conftest.*.
-+ rm -f $ac_outfiles $ac_file
-+
- else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+
+ break;;
+ * ) break;;
+ esac
+@@ -2950,14 +3738,14 @@
fi
--rm -f conftest$ac_cv_exeext
+ rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
--rm -f conftest.$ac_ext
-+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+
-+
-+ac_clean_files=$ac_clean_files_save
-+
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.o conftest.obj
-+ rm -f conftest.o conftest.obj
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+@@ -2977,14 +3765,20 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -7244,11 +7303,9 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3000,14 +3740,16 @@
- { (exit 1); exit 1; }; }
- fi
+@@ -3002,12 +3796,12 @@
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
@@ -7258,23 +7315,66 @@
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+
-+
-+rm -f conftest.*
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3056,24 +3798,28 @@
+@@ -3030,24 +3824,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3056,24 +3862,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -7302,90 +7402,225 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3115,97 +3861,23 @@
+@@ -3089,24 +3899,147 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_prog_cc_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3115,12 +4048,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
--fi
++
++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 conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
-- CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
-- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-- else
-- CFLAGS="-g"
-- fi
--else
-- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-- else
-- CFLAGS=
-- fi
--fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3136,12 +4077,12 @@
+ CFLAGS=
+ fi
+ fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
++ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-- function prototypes and stuff, but not '\xHH' hex character constants.
-- These don't provoke an error unfortunately, instead are silently treated
+@@ -3175,12 +4116,17 @@
+ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
-- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-- array size at least. It's necessary to write '\x00'==0 to get something
++ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++ that's true only with -std. */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
- ;
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3195,205 +4141,74 @@
return 0;
}
_ACEOF
@@ -7397,42 +7632,93 @@
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
-+rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
-@@ -3227,81 +3899,24 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-+ :
++ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--fi
++
+ fi
-rm -f conftest.err conftest.$ac_objext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
-rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+
+ fi
-
--fi
--
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-- *)
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
@@ -7473,176 +7759,103 @@
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+
- ;
- return 0;
- }
-@@ -3328,30 +3943,104 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- :
-+ ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-continue
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-@@ -3373,27 +4062,36 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- break
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-
+-fi
+-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -7652,7 +7865,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3402,8 +4100,8 @@
+@@ -3402,8 +4217,8 @@
depcc="$CC" am_compiler_list=
@@ -7663,7 +7876,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3492,8 +4190,8 @@
+@@ -3492,8 +4307,8 @@
fi
fi
@@ -7674,7 +7887,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3515,8 +4213,8 @@
+@@ -3515,8 +4330,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
@@ -7685,7 +7898,23 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3576,9 +4274,10 @@
+@@ -3550,8 +4365,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3576,9 +4396,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7697,7 +7926,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3616,6 +4315,7 @@
+@@ -3588,8 +4409,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3616,6 +4442,7 @@
ac_preproc_ok=:
break
fi
@@ -7705,7 +7950,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3633,8 +4333,8 @@
+@@ -3633,8 +4460,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7716,7 +7961,23 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3683,9 +4383,10 @@
+@@ -3657,8 +4484,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3683,9 +4515,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7728,7 +7989,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3723,6 +4424,7 @@
+@@ -3695,8 +4528,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -3723,6 +4561,7 @@
ac_preproc_ok=:
break
fi
@@ -7736,7 +8013,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3773,18 +4475,22 @@
+@@ -3773,18 +4612,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -7764,7 +8041,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3797,36 +4503,38 @@
+@@ -3797,36 +4640,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7811,7 +8088,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3839,55 +4547,70 @@
+@@ -3839,55 +4684,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7873,22 +8150,37 @@
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -7900,15 +8192,61 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3936,24 +4659,28 @@
+@@ -3910,24 +4785,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3936,24 +4823,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -7936,7 +8274,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3995,47 +4722,18 @@
+@@ -3969,24 +4860,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -3995,70 +4898,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7988,7 +8371,50 @@
;
return 0;
}
-@@ -4067,20 +4765,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4067,61 +4953,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8014,9 +8440,48 @@
;
return 0;
}
-@@ -4107,21 +4804,40 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- break
+ ac_cv_prog_cxx_g=yes
@@ -8026,20 +8491,21 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++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 conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++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
@@ -8062,7 +8528,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4130,8 +4846,8 @@
+@@ -4130,8 +5046,8 @@
depcc="$CXX" am_compiler_list=
@@ -8073,7 +8539,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4220,8 +4936,8 @@
+@@ -4220,8 +5136,8 @@
fi
fi
@@ -8084,7 +8550,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4239,8 +4955,8 @@
+@@ -4239,8 +5155,8 @@
@@ -8095,7 +8561,52 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4291,13 +5007,14 @@
+@@ -4265,24 +5181,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4291,13 +5219,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8103,17 +8614,18 @@
+ kde_bad_compiler=yes
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+echo "${ECHO_T}$kde_bad_compiler" >&6; }
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4339,17 +5056,16 @@
+@@ -4339,17 +5268,16 @@
fi
fi
@@ -8135,17 +8647,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4403,7 +5119,9 @@
+@@ -4377,24 +5305,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4403,8 +5343,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4417,29 +5135,28 @@
+ ac_ext=c
+@@ -4417,29 +5359,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8183,17 +8742,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4492,7 +5209,9 @@
+@@ -4466,24 +5407,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4492,8 +5445,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4506,13 +5225,13 @@
+ ac_ext=c
+@@ -4506,13 +5461,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8211,7 +8817,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4533,16 +5252,15 @@
+@@ -4533,16 +5488,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8232,17 +8838,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4595,7 +5313,9 @@
+@@ -4569,24 +5523,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4595,8 +5561,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4609,16 +5329,16 @@
+ ac_ext=c
+@@ -4609,16 +5577,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8263,7 +8916,7 @@
:
fi
-@@ -4633,16 +5353,15 @@
+@@ -4633,16 +5601,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"
@@ -8284,17 +8937,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4695,7 +5414,9 @@
+@@ -4669,24 +5636,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4695,8 +5674,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4709,27 +5430,26 @@
+ ac_ext=c
+@@ -4709,27 +5690,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8329,17 +9029,64 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4780,7 +5500,9 @@
+@@ -4754,24 +5734,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4780,8 +5772,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4794,13 +5516,13 @@
+ ac_ext=c
+@@ -4794,13 +5788,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -8357,7 +9104,7 @@
:
fi
-@@ -4808,16 +5530,15 @@
+@@ -4808,16 +5802,15 @@
;;
esac
@@ -8378,17 +9125,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4870,7 +5591,9 @@
+@@ -4844,24 +5837,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4870,8 +5875,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4884,28 +5607,27 @@
+ ac_ext=c
+@@ -4884,28 +5891,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8425,17 +9219,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4958,7 +5680,9 @@
+@@ -4932,24 +5938,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -4958,8 +5976,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4972,28 +5696,27 @@
+ ac_ext=c
+@@ -4972,28 +5992,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8472,17 +9313,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5046,7 +5769,9 @@
+@@ -5020,24 +6039,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5046,8 +6077,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5060,13 +5785,13 @@
+ ac_ext=c
+@@ -5060,13 +6093,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8500,7 +9388,7 @@
:
fi
-@@ -5078,13 +5803,13 @@
+@@ -5078,13 +6111,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -8518,7 +9406,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5092,16 +5817,15 @@
+@@ -5092,16 +6125,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -8539,17 +9427,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5154,7 +5878,9 @@
+@@ -5128,24 +6160,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5154,8 +6198,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5168,13 +5894,13 @@
+ ac_ext=c
+@@ -5168,13 +6214,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8567,7 +9502,7 @@
:
fi
-@@ -5186,16 +5912,15 @@
+@@ -5186,16 +6232,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -8588,17 +9523,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5248,7 +5973,9 @@
+@@ -5222,24 +6267,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5248,8 +6305,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5262,28 +5989,27 @@
+ ac_ext=c
+@@ -5262,28 +6321,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8635,17 +9617,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5336,7 +6062,9 @@
+@@ -5310,24 +6368,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5336,8 +6406,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5350,28 +6078,27 @@
+ ac_ext=c
+@@ -5350,28 +6422,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8682,17 +9711,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5424,7 +6151,9 @@
+@@ -5398,24 +6469,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5424,8 +6507,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5438,28 +6167,27 @@
+ ac_ext=c
+@@ -5438,28 +6523,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8729,17 +9805,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5512,7 +6240,9 @@
+@@ -5486,24 +6570,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5512,8 +6608,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5526,13 +6256,13 @@
+ ac_ext=c
+@@ -5526,13 +6624,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8757,7 +9880,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5540,37 +6270,37 @@
+@@ -5540,37 +6638,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -8809,7 +9932,52 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5628,9 +6358,10 @@
+@@ -5602,24 +6700,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5628,18 +6738,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8817,11 +9985,12 @@
+ kde_cv_opt_noinline_match=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5638,8 +6369,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -8832,7 +10001,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5659,16 +6390,15 @@
+@@ -5659,16 +6770,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -8853,17 +10022,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5721,7 +6451,9 @@
+@@ -5695,24 +6805,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5721,8 +6843,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5735,29 +6467,28 @@
+ ac_ext=c
+@@ -5735,29 +6859,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8901,17 +10117,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5810,7 +6541,9 @@
+@@ -5784,24 +6907,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5810,8 +6945,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5824,28 +6557,27 @@
+ ac_ext=c
+@@ -5824,28 +6961,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8948,17 +10211,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5898,7 +6630,9 @@
+@@ -5872,24 +7008,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5898,8 +7046,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5912,28 +6646,27 @@
+ ac_ext=c
+@@ -5912,28 +7062,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8995,17 +10305,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5986,7 +6719,9 @@
+@@ -5960,24 +7109,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -5986,8 +7147,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6000,28 +6735,27 @@
+ ac_ext=c
+@@ -6000,28 +7163,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9042,17 +10399,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6074,7 +6808,9 @@
+@@ -6048,24 +7210,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6074,8 +7248,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6088,28 +6824,27 @@
+ ac_ext=c
+@@ -6088,28 +7264,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9089,17 +10493,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6162,7 +6897,9 @@
+@@ -6136,24 +7311,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6162,8 +7349,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6176,13 +6913,13 @@
+ ac_ext=c
+@@ -6176,13 +7365,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9117,7 +10568,7 @@
:
fi
-@@ -6289,13 +7026,13 @@
+@@ -6289,13 +7478,13 @@
fi
@@ -9134,7 +10585,23 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6351,9 +7088,10 @@
+@@ -6325,8 +7514,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6351,9 +7545,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9146,7 +10613,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6391,6 +7129,7 @@
+@@ -6363,8 +7558,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6391,6 +7591,7 @@
ac_preproc_ok=:
break
fi
@@ -9154,7 +10637,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6408,8 +7147,8 @@
+@@ -6408,8 +7609,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -9165,7 +10648,23 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6458,9 +7197,10 @@
+@@ -6432,8 +7633,13 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6458,9 +7664,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9177,7 +10676,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6498,6 +7238,7 @@
+@@ -6470,8 +7677,13 @@
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -6498,6 +7710,7 @@
ac_preproc_ok=:
break
fi
@@ -9185,7 +10700,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6524,16 +7265,15 @@
+@@ -6524,16 +7737,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -9206,17 +10721,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6586,7 +7326,9 @@
+@@ -6560,24 +7772,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6586,8 +7810,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6600,22 +7342,21 @@
+ ac_ext=c
+@@ -6600,22 +7826,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9245,7 +10807,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6631,36 +7372,36 @@
+@@ -6631,36 +7856,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -9292,17 +10854,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6713,7 +7454,9 @@
+@@ -6687,24 +7912,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6713,8 +7950,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6727,29 +7470,28 @@
+ ac_ext=c
+@@ -6727,29 +7966,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9340,17 +10949,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6802,7 +7544,9 @@
+@@ -6776,24 +8014,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -6802,8 +8052,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6816,13 +7560,13 @@
+ ac_ext=c
+@@ -6816,13 +8068,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9368,7 +11024,7 @@
:
fi
-@@ -6832,13 +7576,13 @@
+@@ -6832,13 +8084,13 @@
@@ -9386,7 +11042,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6851,13 +7595,13 @@
+@@ -6851,13 +8103,13 @@
@@ -9404,31 +11060,38 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6868,198 +7612,19 @@
+@@ -6868,278 +8120,99 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
--
++ fi
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
--
--
--
+
+
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi
+
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -9437,7 +11100,15 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
++
+
-int
-main ()
-{
@@ -9472,7 +11143,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
@@ -9482,33 +11153,85 @@
-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
--
--
--fi
--
+
+
++
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then
++ enableval=$enable_shared; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_shared=yes
+ fi
+
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
--
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then
++ enableval=$enable_static; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
+ else
++ enable_static=no
++fi
+
+
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
++
++ kdelibsuff="$kde_libs_suffix"
++ if test -z "$kdelibsuff"; then
++ kdelibsuff="no"
++ fi
++ # Check whether --enable-libsuffix was given.
++if test "${enable_libsuffix+set}" = set; then
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
+
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -9517,7 +11240,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ if test "$kdelibsuff" = "auto"; then
+
-int
-main ()
-{
@@ -9587,83 +11311,106 @@
-
- ;;
- esac
- fi
-
-
-
-
-
+- fi
+-
+-
+-
+-
+-
- # Check whether --enable-nmcheck or --disable-nmcheck was given.
-+ # Check whether --enable-nmcheck was given.
- if test "${enable_nmcheck+set}" = set; then
+-if test "${enable_nmcheck+set}" = set; then
- enableval="$enable_nmcheck"
- kde_use_nmcheck=$enableval
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
- kde_use_nmcheck=no
+-else
+- kde_use_nmcheck=no
-fi;
-+fi
-+
-
- if test "$kde_use_nmcheck" = "yes"; then
- KDE_USE_NMCHECK_TRUE=""
-@@ -7074,10 +7639,9 @@
-
-
-
+-
+- if test "$kde_use_nmcheck" = "yes"; then
+- KDE_USE_NMCHECK_TRUE=""
+- KDE_USE_NMCHECK_FALSE="#"
+- else
+- 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
+-if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
- p=${PACKAGE-default}
-+ enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
-@@ -7096,12 +7660,12 @@
- esac
- else
- enable_shared=yes
+- case $enableval in
+- yes) enable_shared=yes ;;
+- no) enable_shared=no ;;
+- *)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- 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
+-if test "${enable_static+set}" = set; then
- enableval="$enable_static"
- p=${PACKAGE-default}
-+ enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
-@@ -7120,7 +7684,8 @@
- esac
- else
- enable_static=no
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac
+-else
+- enable_static=no
-fi;
-+fi
-+
-
-
-
-@@ -7129,11 +7694,11 @@
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
+-
+-
+-
+-
+- kdelibsuff="$kde_libs_suffix"
+- 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
+-if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
-fi;
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
-+fi
-+
-
- if test "$kdelibsuff" = "auto"; then
-
-@@ -7154,8 +7719,8 @@
+-
+- if test "$kdelibsuff" = "auto"; then
+-
+-cat > conftest.c << EOF
+-#include <stdio.h>
+-int main() {
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
+ return 0;
+ }
+ EOF
+@@ -7154,8 +8227,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -9674,7 +11421,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7171,14 +7736,13 @@
+@@ -7171,14 +8244,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -9693,22 +11440,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7197,10 +7761,11 @@
+@@ -7197,10 +8269,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7224,7 +7789,7 @@
+@@ -7224,7 +8297,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
@@ -9717,7 +11464,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7253,57 +7818,204 @@
+@@ -7253,37 +8326,184 @@
fi
SED=$lt_cv_path_SED
@@ -9732,17 +11479,17 @@
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9775,7 +11522,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
- fi
++ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -9798,20 +11545,13 @@
+ { { 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_GREP=$GREP
+fi
-
-
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
-- withval="$with_gnu_ld"
-- test "$withval" = no || with_gnu_ld=yes
++
++
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -9822,34 +11562,7 @@
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- with_gnu_ld=no
--fi;
--ac_prog=ld
--if test "$GCC" = yes; then
-- # Check if gcc -print-prog-name=ld gives a path.
-- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-- case $host in
-- *-*-mingw*)
-- # gcc leaves a trailing carriage return which upsets mingw
-- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-- *)
-- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-- esac
-- case $ac_prog in
-- # Accept absolute paths.
-- [\\/]* | ?:[\\/]*)
-- re_direlt='/[^/][^/]*/\.\./'
-- # Canonicalize the pathname of ld
-- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-- done
-- test -z "$LD" && LD="$ac_prog"
-- ;;
-- "")
-- # If it fails, then pretend we aren't using GCC.
++else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -9891,7 +11604,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
-+ fi
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -9922,50 +11635,39 @@
+
+
+ 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
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+ with_gnu_ld=no
+ else
+ with_gnu_ld=no
+-fi;
+fi
+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [\\/]* | ?:[\\/]*)
-+ re_direlt='/[^/][^/]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -7312,11 +8532,11 @@
;;
- *)
-@@ -7312,11 +8024,11 @@
- ;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
@@ -9980,7 +11682,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7329,7 +8041,7 @@
+@@ -7329,7 +8549,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,
@@ -9989,7 +11691,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7349,21 +8061,21 @@
+@@ -7349,21 +8569,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -10018,7 +11720,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7373,29 +8085,38 @@
+@@ -7373,29 +8593,38 @@
;;
esac
fi
@@ -10065,7 +11767,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7403,56 +8124,63 @@
+@@ -7403,56 +8632,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -10163,7 +11865,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7479,44 +8207,36 @@
+@@ -7479,44 +8715,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -10218,7 +11920,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7532,7 +8252,7 @@
+@@ -7532,7 +8760,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -10227,7 +11929,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7548,43 +8268,27 @@
+@@ -7548,43 +8776,27 @@
esac
;;
@@ -10284,7 +11986,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7603,32 +8307,22 @@
+@@ -7603,32 +8815,22 @@
;;
openbsd*)
@@ -10320,7 +12022,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7649,17 +8343,20 @@
+@@ -7649,17 +8851,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -10344,7 +12046,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7668,14 +8365,17 @@
+@@ -7668,14 +8873,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -10365,16 +12067,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7702,7 +8402,7 @@
+@@ -7702,7 +8910,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7705 "configure"' > conftest.$ac_ext
-+ echo '#line 8405 "configure"' > conftest.$ac_ext
++ echo '#line 8913 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7745,14 +8445,13 @@
+@@ -7745,14 +8953,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -10391,7 +12093,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7764,7 +8463,6 @@
+@@ -7764,7 +8971,6 @@
esac
;;
*64-bit*)
@@ -10399,7 +12101,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7789,8 +8487,8 @@
+@@ -7789,8 +8995,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -10410,18 +12112,65 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7842,8 +8540,9 @@
+@@ -7816,24 +9022,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -7842,9 +9060,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7853,13 +8552,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7853,13 +9072,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -10457,7 +12206,7 @@
esac
-@@ -7867,8 +8586,8 @@
+@@ -7867,8 +9106,8 @@
@@ -10468,18 +12217,65 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7918,8 +8637,9 @@
+@@ -7892,24 +9131,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -7918,9 +9169,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7976,6 +8696,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7976,6 +9228,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -10487,7 +12283,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7995,8 +8716,8 @@
+@@ -7995,18 +9248,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -10498,7 +12294,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -8019,12 +8740,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8019,12 +9281,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -10516,7 +12335,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8047,9 +8770,9 @@
+@@ -8047,9 +9311,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10529,15 +12348,61 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8089,12 +8812,14 @@
+@@ -8063,24 +9327,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8089,12 +9365,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -10547,7 +12412,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8109,18 +8834,19 @@
+@@ -8109,18 +9387,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10575,17 +12440,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8157,15 +8883,16 @@
+@@ -8131,24 +9410,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8157,15 +9448,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -10597,7 +12508,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8199,9 +8926,10 @@
+@@ -8174,8 +9466,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -8199,9 +9496,10 @@
ac_header_preproc=no
fi
@@ -10610,7 +12537,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8225,25 +8953,19 @@
+@@ -8225,25 +9523,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;}
@@ -10643,12 +12570,64 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8255,17 +8977,258 @@
+@@ -8255,228 +9547,547 @@
done
-+
-+
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$F77"; then
+- ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- test -n "$F77" && break
+- done
+-fi
+-if test -z "$F77"; then
+- ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
@@ -10661,21 +12640,88 @@
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_F77"; then
+- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_F77="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- test -n "$ac_ct_F77" && break
+-done
+-
+- F77=$ac_ct_F77
+-fi
+-
+-
+-# Provide some information about the compiler.
+-echo "$as_me:8350:" \
+- "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
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-rm -f a.out
+-
+-# If we don't use `.F' as extension, the preprocessor is not run on the
+-# input file. (Note that this only needs to work for GNU compilers.)
+-ac_save_ext=$ac_ext
+-ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+- program main
+-#ifndef __GNUC__
+- choke me
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
@@ -10685,16 +12731,41 @@
+# include <limits.h>
+#else
+# include <assert.h>
-+#endif
+ #endif
+-
+- end
+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_compiler_gnu=yes
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -10707,33 +12778,75 @@
+fi
+if test -z "$ac_cpp_err"; then
+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
+ # Broken: fails on valid input.
+continue
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+-ac_ext=$ac_save_ext
+-ac_test_FFLAGS=${FFLAGS+set}
+-ac_save_FFLAGS=$FFLAGS
+-FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_f77_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- FFLAGS=-g
+-cat >conftest.$ac_ext <<_ACEOF
+- program main
+rm -f conftest.err conftest.$ac_ext
-+
+
+- end
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_f77_g=yes
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -10747,15 +12860,17 @@
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
+ # Passes both tests.
+ac_preproc_ok=:
+break
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -10763,7 +12878,18 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+-if test "$ac_test_FFLAGS" = set; then
+- 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
+- FFLAGS="-g"
+- fi
+-else
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -10797,8 +12923,13 @@
+#endif
+ Syntax error
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -10836,8 +12967,13 @@
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -10888,104 +13024,97 @@
+
+fi
+
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8278,36 +9241,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$F77"; then
++ ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
++ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+IFS=$as_save_IFS
-
- fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
-- echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
+ { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
-
++fi
+
- test -n "$F77" && break
- done
- fi
- if test -z "$F77"; then
- ac_ct_F77=$F77
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++
++ test -n "$F77" && break
++ done
++fi
++if test -z "$F77"; then
++ ac_ct_F77=$F77
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8320,48 +9285,63 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_F77"; then
++ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
++ ac_cv_prog_ac_ct_F77="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
-- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
-
++fi
+
- test -n "$ac_ct_F77" && break
- done
-
-- F77=$ac_ct_F77
++
++ test -n "$ac_ct_F77" && break
++done
++
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
@@ -11001,92 +13130,184 @@
+esac
+ F77=$ac_ct_F77
+ fi
- fi
-
-
- # Provide some information about the compiler.
--echo "$as_me:8350:" \
-- "checking for Fortran 77 compiler version" >&5
++fi
++
++
++# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+ (eval $ac_compiler --version >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+ (eval $ac_compiler -v >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+ (eval $ac_compiler -V >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -8371,8 +9351,8 @@
- # input file. (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler --version >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file. (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8411,20 +9391,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++ program main
++#ifndef __GNUC__
++ choke me
++#endif
++
++ end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_compiler_gnu=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
- fi
++fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8461,13 +9442,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_f77_g=no
++if test "${ac_cv_prog_f77_g+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++ program main
++
++ end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_prog_f77_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_f77_g=no
- fi
++fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -8496,13 +9478,13 @@
++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
++ FFLAGS="-g"
++ fi
++else
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-O2"
+ else
+@@ -8496,13 +10107,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -11103,7 +13324,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8531,20 +9513,70 @@
+@@ -8531,20 +10142,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -11180,7 +13401,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8555,19 +9587,19 @@
+@@ -8555,19 +10216,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -11206,7 +13427,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8581,9 +9613,6 @@
+@@ -8581,9 +10242,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -11216,7 +13437,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8605,14 +9634,30 @@
+@@ -8605,14 +10263,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'"
;;
@@ -11249,7 +13470,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8630,14 +9675,17 @@
+@@ -8630,14 +10304,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -11269,7 +13490,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8755,15 +9803,15 @@
+@@ -8755,15 +10432,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
@@ -11291,7 +13512,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8777,8 +9825,8 @@
+@@ -8777,8 +10454,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -11302,7 +13523,7 @@
objdir=$lt_cv_objdir
-@@ -8799,7 +9847,7 @@
+@@ -8799,7 +10476,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -11311,7 +13532,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8819,7 +9867,7 @@
+@@ -8819,7 +10496,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -11320,7 +13541,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8829,8 +9877,8 @@
+@@ -8829,8 +10506,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
@@ -11331,7 +13552,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8843,32 +9891,34 @@
+@@ -8843,32 +10520,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11373,7 +13594,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8881,27 +9931,41 @@
+@@ -8881,27 +10560,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11422,7 +13643,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8909,8 +9973,8 @@
+@@ -8909,8 +10602,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
@@ -11433,7 +13654,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8923,32 +9987,34 @@
+@@ -8923,32 +10616,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11475,7 +13696,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8961,27 +10027,41 @@
+@@ -8961,27 +10656,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11524,7 +13745,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8989,8 +10069,8 @@
+@@ -8989,8 +10698,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
@@ -11535,7 +13756,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9003,32 +10083,34 @@
+@@ -9003,32 +10712,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11577,7 +13798,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9041,27 +10123,41 @@
+@@ -9041,27 +10752,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11626,7 +13847,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9076,6 +10172,7 @@
+@@ -9076,6 +10801,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -11634,7 +13855,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9095,21 +10192,32 @@
+@@ -9095,21 +10821,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -11671,7 +13892,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9129,7 +10237,7 @@
+@@ -9129,7 +10866,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11680,7 +13901,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9161,17 +10269,17 @@
+@@ -9161,17 +10898,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11704,7 +13925,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9191,7 +10299,7 @@
+@@ -9191,7 +10928,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11713,7 +13934,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9223,11 +10331,11 @@
+@@ -9223,11 +10960,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11729,7 +13950,7 @@
fi
else
-@@ -9242,21 +10350,21 @@
+@@ -9242,21 +10979,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -11758,7 +13979,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9286,68 +10394,25 @@
+@@ -9286,68 +11023,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11842,7 +14063,7 @@
## CAVEAT EMPTOR:
-@@ -9361,8 +10426,8 @@
+@@ -9361,8 +11055,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11853,7 +14074,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9376,26 +10441,28 @@
+@@ -9376,26 +11070,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 \
@@ -11862,12 +14083,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9382: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10447: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11076: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9386: \$? = $ac_status" >&5
-+ echo "$as_me:10451: \$? = $ac_status" >&5
++ echo "$as_me:11080: \$? = $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
@@ -11889,7 +14110,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9409,8 +10476,8 @@
+@@ -9409,8 +11105,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11900,7 +14121,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9448,6 +10515,11 @@
+@@ -9448,6 +11144,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -11912,7 +14133,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9464,7 +10536,7 @@
+@@ -9464,7 +11165,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11921,7 +14142,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9490,6 +10562,16 @@
+@@ -9490,6 +11191,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11938,7 +14159,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9501,7 +10583,7 @@
+@@ -9501,7 +11212,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.
@@ -11947,7 +14168,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9524,13 +10606,20 @@
+@@ -9524,13 +11235,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -11970,7 +14191,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9545,15 +10634,15 @@
+@@ -9545,15 +11263,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -11992,7 +14213,7 @@
;;
sunos4*)
-@@ -9562,7 +10651,7 @@
+@@ -9562,7 +11280,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -12001,7 +14222,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9575,6 +10664,17 @@
+@@ -9575,6 +11293,17 @@
fi
;;
@@ -12019,7 +14240,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9586,16 +10686,16 @@
+@@ -9586,16 +11315,16 @@
esac
fi
@@ -12040,7 +14261,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9609,26 +10709,28 @@
+@@ -9609,26 +11338,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 \
@@ -12049,12 +14270,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10715: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11344: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9619: \$? = $ac_status" >&5
-+ echo "$as_me:10719: \$? = $ac_status" >&5
++ echo "$as_me:11348: \$? = $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
@@ -12076,7 +14297,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9641,7 +10743,7 @@
+@@ -9641,7 +11372,7 @@
fi
fi
@@ -12085,13 +14306,12 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9651,72 +10753,112 @@
+@@ -9651,8 +11382,50 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -12099,25 +14319,8 @@
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_cv_prog_compiler_c_o=no
-- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -12153,19 +14356,23 @@
+
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9663,60 +11436,58 @@
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -12174,12 +14381,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9682: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10819: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11448: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9686: \$? = $ac_status" >&5
-+ echo "$as_me:10823: \$? = $ac_status" >&5
++ echo "$as_me:11452: \$? = $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
@@ -12231,7 +14438,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9726,8 +10868,8 @@
+@@ -9726,8 +11497,8 @@
need_locks=no
fi
@@ -12242,7 +14449,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9765,6 +10907,16 @@
+@@ -9765,6 +11536,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -12259,7 +14466,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9775,6 +10927,10 @@
+@@ -9775,6 +11556,10 @@
with_gnu_ld=no
fi
;;
@@ -12270,7 +14477,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9785,6 +10941,27 @@
+@@ -9785,6 +11570,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -12298,7 +14505,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9822,7 +10999,7 @@
+@@ -9822,7 +11628,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -12307,7 +14514,7 @@
else
ld_shlibs=no
fi
-@@ -9832,13 +11009,13 @@
+@@ -9832,13 +11638,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'
@@ -12324,7 +14531,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9847,23 +11024,70 @@
+@@ -9847,23 +11653,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -12400,7 +14607,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9877,13 +11101,40 @@
+@@ -9877,13 +11730,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12443,7 +14650,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9893,24 +11144,19 @@
+@@ -9893,24 +11773,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12475,7 +14682,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9922,7 +11168,7 @@
+@@ -9922,7 +11797,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -12484,7 +14691,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9944,9 +11190,21 @@
+@@ -9944,9 +11819,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
@@ -12508,7 +14715,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9963,7 +11221,7 @@
+@@ -9963,7 +11850,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -12517,7 +14724,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`
-@@ -9982,8 +11240,12 @@
+@@ -9982,8 +11869,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -12530,7 +14737,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9991,22 +11253,23 @@
+@@ -9991,22 +11882,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12561,14 +14768,60 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10053,19 +11316,20 @@
+@@ -10022,24 +11914,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -10053,19 +11957,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12586,17 +14839,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10115,7 +11379,9 @@
+@@ -10084,24 +11989,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -10115,8 +12032,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10125,13 +11391,11 @@
+
+@@ -10125,13 +12044,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -12613,7 +14913,7 @@
fi
fi
;;
-@@ -10144,7 +11408,7 @@
+@@ -10144,7 +12061,7 @@
ld_shlibs=no
;;
@@ -12622,7 +14922,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10154,13 +11418,13 @@
+@@ -10154,13 +12071,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -12639,7 +14939,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10170,52 +11434,52 @@
+@@ -10170,52 +12087,52 @@
;;
darwin* | rhapsody*)
@@ -12732,7 +15032,7 @@
fi
;;
-@@ -10249,8 +11513,8 @@
+@@ -10249,8 +12166,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12743,7 +15043,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10258,7 +11522,7 @@
+@@ -10258,7 +12175,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -12752,7 +15052,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10272,47 +11536,62 @@
+@@ -10272,47 +12189,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -12839,7 +15139,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10326,7 +11605,7 @@
+@@ -10326,7 +12258,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12848,7 +15148,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10336,7 +11615,7 @@
+@@ -10336,7 +12268,7 @@
link_all_deplibs=yes
;;
@@ -12857,7 +15157,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10359,7 +11638,8 @@
+@@ -10359,7 +12291,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
@@ -12867,7 +15167,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10369,7 +11649,7 @@
+@@ -10369,7 +12302,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -12876,7 +15176,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10380,14 +11660,14 @@
+@@ -10380,14 +12313,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -12893,7 +15193,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10399,13 +11679,13 @@
+@@ -10399,13 +12332,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -12909,7 +15209,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10413,21 +11693,15 @@
+@@ -10413,21 +12346,15 @@
hardcode_libdir_separator=:
;;
@@ -12935,7 +15235,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10436,8 +11710,18 @@
+@@ -10436,8 +12363,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12956,7 +15256,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10446,7 +11730,7 @@
+@@ -10446,7 +12383,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.
@@ -12965,7 +15265,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10494,36 +11778,45 @@
+@@ -10494,36 +12431,45 @@
fi
;;
@@ -13032,7 +15332,7 @@
;;
uts4*)
-@@ -10538,15 +11831,10 @@
+@@ -10538,15 +12484,10 @@
esac
fi
@@ -13050,7 +15350,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10564,8 +11852,8 @@
+@@ -10564,8 +12505,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.
@@ -13061,7 +15361,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10579,6 +11867,7 @@
+@@ -10579,6 +12520,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -13069,7 +15369,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10601,20 +11890,20 @@
+@@ -10601,20 +12543,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -13095,7 +15395,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10624,7 +11913,20 @@
+@@ -10624,7 +12566,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13117,7 +15417,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10689,7 +11991,7 @@
+@@ -10689,7 +12644,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13126,7 +15426,7 @@
;;
beos*)
-@@ -10698,7 +12000,7 @@
+@@ -10698,7 +12653,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13135,7 +15435,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10714,7 +12016,7 @@
+@@ -10714,7 +12669,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13144,7 +15444,7 @@
need_version=no
need_lib_prefix=no
-@@ -10726,7 +12028,8 @@
+@@ -10726,7 +12681,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13154,7 +15454,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10756,7 +12059,7 @@
+@@ -10756,7 +12712,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13163,7 +15463,7 @@
;;
esac
;;
-@@ -10779,7 +12082,7 @@
+@@ -10779,7 +12735,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13172,7 +15472,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10802,20 +12105,17 @@
+@@ -10802,20 +12758,17 @@
dynamic_linker=no
;;
@@ -13204,7 +15504,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10833,14 +12133,19 @@
+@@ -10833,14 +12786,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13226,7 +15526,7 @@
esac
;;
-@@ -10860,9 +12165,9 @@
+@@ -10860,9 +12818,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13238,7 +15538,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10877,7 +12182,7 @@
+@@ -10877,7 +12835,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13247,7 +15547,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10888,7 +12193,7 @@
+@@ -10888,7 +12846,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13256,7 +15556,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10900,6 +12205,18 @@
+@@ -10900,6 +12858,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13275,7 +15575,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10943,29 +12260,26 @@
+@@ -10943,29 +12913,26 @@
;;
# This must be Linux ELF.
@@ -13312,7 +15612,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10975,6 +12289,18 @@
+@@ -10975,6 +12942,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -13331,7 +15631,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10984,7 +12310,7 @@
+@@ -10984,7 +12963,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -13340,7 +15640,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11012,8 +12338,13 @@
+@@ -11012,8 +12991,13 @@
openbsd*)
version_type=sunos
@@ -13355,7 +15655,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -11033,7 +12364,7 @@
+@@ -11033,7 +13017,7 @@
os2*)
libname_spec='$name'
@@ -13364,7 +15664,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11051,13 +12382,6 @@
+@@ -11051,13 +13035,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -13378,7 +15678,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11083,7 +12407,7 @@
+@@ -11083,7 +13060,7 @@
need_version=yes
;;
@@ -13387,7 +15687,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11116,6 +12440,29 @@
+@@ -11116,6 +13093,29 @@
fi
;;
@@ -13417,7 +15717,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11127,16 +12474,21 @@
+@@ -11127,16 +13127,21 @@
dynamic_linker=no
;;
esac
@@ -13445,7 +15745,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11156,8 +12508,8 @@
+@@ -11156,8 +13161,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -13456,7 +15756,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11170,29 +12522,29 @@
+@@ -11170,29 +13175,29 @@
striplib=
old_striplib=
@@ -13496,7 +15796,7 @@
;;
esac
fi
-@@ -11224,8 +12576,8 @@
+@@ -11224,8 +13229,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -13507,7 +15807,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11238,17 +12590,17 @@
+@@ -11238,40 +13243,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13529,15 +15829,59 @@
;
return 0;
}
-@@ -11280,14 +12632,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11280,14 +13297,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13548,7 +15892,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11301,8 +12654,8 @@
+@@ -11301,8 +13319,8 @@
;;
*)
@@ -13559,7 +15903,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11329,30 +12682,24 @@
+@@ -11329,53 +13347,59 @@
#undef shl_load
@@ -13595,15 +15939,59 @@
;
return 0;
}
-@@ -11384,18 +12731,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11384,18 +13408,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -13620,7 +16008,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11408,17 +12756,17 @@
+@@ -11408,40 +13433,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13642,15 +16030,59 @@
;
return 0;
}
-@@ -11450,19 +12798,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11450,19 +13487,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13668,7 +16100,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11489,30 +12838,24 @@
+@@ -11489,53 +13527,59 @@
#undef dlopen
@@ -13704,15 +16136,59 @@
;
return 0;
}
-@@ -11544,18 +12887,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11544,18 +13588,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -13729,7 +16205,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11568,17 +12912,17 @@
+@@ -11568,40 +13613,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13751,15 +16227,59 @@
;
return 0;
}
-@@ -11610,19 +12954,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11610,19 +13667,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13777,7 +16297,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11635,17 +12980,17 @@
+@@ -11635,40 +13693,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13799,15 +16319,59 @@
;
return 0;
}
-@@ -11677,19 +13022,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11677,19 +13747,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13825,7 +16389,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11702,17 +13048,17 @@
+@@ -11702,40 +13773,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13847,15 +16411,59 @@
;
return 0;
}
-@@ -11744,14 +13090,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11744,14 +13827,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13866,7 +16474,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11786,13 +13133,13 @@
+@@ -11786,13 +13870,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -13883,16 +16491,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11802,7 +13149,7 @@
+@@ -11802,7 +13886,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11805 "configure"
-+#line 13152 "configure"
++#line 13889 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11859,6 +13206,8 @@
+@@ -11859,6 +13943,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13901,7 +16509,7 @@
exit (status);
}
-@@ -11868,12 +13217,12 @@
+@@ -11868,12 +13954,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13916,7 +16524,7 @@
esac
else :
# compilation failed
-@@ -11884,13 +13233,13 @@
+@@ -11884,13 +13970,13 @@
fi
@@ -13935,16 +16543,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11900,7 +13249,7 @@
+@@ -11900,7 +13986,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11903 "configure"
-+#line 13252 "configure"
++#line 13989 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11957,6 +13306,8 @@
+@@ -11957,6 +14043,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13953,7 +16561,7 @@
exit (status);
}
-@@ -11966,12 +13317,12 @@
+@@ -11966,12 +14054,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13968,7 +16576,7 @@
esac
else :
# compilation failed
-@@ -11982,8 +13333,8 @@
+@@ -11982,8 +14070,8 @@
fi
@@ -13979,7 +16587,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12004,19 +13355,19 @@
+@@ -12004,19 +14092,19 @@
fi
@@ -14007,7 +16615,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12025,58 +13376,21 @@
+@@ -12025,58 +14113,21 @@
fi
;;
@@ -14073,7 +16681,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12091,7 +13405,8 @@
+@@ -12091,7 +14142,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.
@@ -14083,7 +16691,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12205,11 +13520,11 @@
+@@ -12205,11 +14257,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -14097,7 +16705,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12239,6 +13554,12 @@
+@@ -12239,6 +14291,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14110,7 +16718,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12250,6 +13571,9 @@
+@@ -12250,6 +14308,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14120,7 +16728,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12269,7 +13593,7 @@
+@@ -12269,7 +14330,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14129,7 +16737,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12300,7 +13624,7 @@
+@@ -12300,7 +14361,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14138,7 +16746,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12315,7 +13639,7 @@
+@@ -12315,7 +14376,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -14147,7 +16755,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12542,7 +13866,10 @@
+@@ -12542,7 +14603,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.
@@ -14159,7 +16767,7 @@
fi
-@@ -12555,11 +13882,11 @@
+@@ -12555,11 +14619,11 @@
CC="$lt_save_CC"
@@ -14175,7 +16783,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12577,6 +13904,9 @@
+@@ -12577,6 +14641,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -14185,7 +16793,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12607,8 +13937,10 @@
+@@ -12607,8 +14674,10 @@
case $tagname in
CXX)
@@ -14198,7 +16806,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12627,6 +13959,7 @@
+@@ -12627,6 +14696,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -14206,7 +16814,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12644,7 +13977,7 @@
+@@ -12644,7 +14714,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -14215,7 +16823,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12654,17 +13987,34 @@
+@@ -12654,17 +14724,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -14251,7 +16859,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12675,18 +14025,27 @@
+@@ -12675,18 +14762,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -14282,7 +16890,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12700,18 +14059,18 @@
+@@ -12700,18 +14796,18 @@
# Set up default GNU C++ configuration
@@ -14307,7 +16915,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12740,11 +14099,11 @@
+@@ -12740,11 +14836,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14323,7 +16931,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12757,7 +14116,7 @@
+@@ -12757,7 +14853,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,
@@ -14332,7 +16940,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12777,21 +14136,21 @@
+@@ -12777,21 +14873,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14361,7 +16969,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12801,8 +14160,8 @@
+@@ -12801,8 +14897,8 @@
;;
esac
fi
@@ -14372,7 +16980,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12810,8 +14169,8 @@
+@@ -12810,8 +14906,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
@@ -14383,7 +16991,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12837,7 +14196,7 @@
+@@ -12837,7 +14933,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.
@@ -14392,7 +17000,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12852,8 +14211,8 @@
+@@ -12852,8 +14948,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -14403,7 +17011,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12868,8 +14227,23 @@
+@@ -12868,8 +14964,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -14429,7 +17037,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12886,7 +14260,7 @@
+@@ -12886,7 +14997,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -14438,7 +17046,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12905,8 +14279,12 @@
+@@ -12905,8 +15016,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -14451,7 +17059,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12915,15 +14293,16 @@
+@@ -12915,15 +15030,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -14472,14 +17080,60 @@
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.
-@@ -12976,20 +14355,21 @@
+@@ -12945,24 +15061,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -12976,20 +15104,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14497,17 +17151,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13039,7 +14419,9 @@
+@@ -13008,24 +15137,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -13039,8 +15180,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13049,16 +14431,26 @@
+
+@@ -13049,16 +15192,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -14539,7 +17240,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13072,12 +14464,12 @@
+@@ -13072,12 +15225,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'
@@ -14554,7 +17255,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13086,70 +14478,81 @@
+@@ -13086,70 +15239,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14688,7 +17389,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13160,14 +14563,14 @@
+@@ -13160,14 +15324,14 @@
;;
esac
;;
@@ -14705,7 +17406,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13184,12 +14587,12 @@
+@@ -13184,12 +15348,12 @@
# location of the library.
case $cc_basename in
@@ -14721,7 +17422,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13198,11 +14601,11 @@
+@@ -13198,11 +15362,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.
@@ -14735,7 +17436,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13212,33 +14615,22 @@
+@@ -13212,33 +15376,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -14776,7 +17477,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13249,17 +14641,20 @@
+@@ -13249,17 +15402,20 @@
esac
case $cc_basename in
@@ -14803,7 +17504,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13275,12 +14670,15 @@
+@@ -13275,12 +15431,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -14823,7 +17524,7 @@
;;
esac
fi
-@@ -13291,11 +14689,25 @@
+@@ -13291,11 +15450,25 @@
;;
esac
;;
@@ -14851,7 +17552,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13306,9 +14718,9 @@
+@@ -13306,9 +15479,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -14863,7 +17564,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13317,16 +14729,16 @@
+@@ -13317,16 +15490,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -14884,7 +17585,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13344,20 +14756,44 @@
+@@ -13344,20 +15517,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -14935,7 +17636,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13385,7 +14821,7 @@
+@@ -13385,7 +15582,7 @@
;;
mvs*)
case $cc_basename in
@@ -14944,7 +17645,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13395,7 +14831,7 @@
+@@ -13395,7 +15592,7 @@
;;
esac
;;
@@ -14953,7 +17654,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13406,15 +14842,31 @@
+@@ -13406,15 +15603,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::"'
;;
@@ -14987,7 +17688,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13424,14 +14876,14 @@
+@@ -13424,14 +15637,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -15005,7 +17706,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13449,7 +14901,7 @@
+@@ -13449,7 +15662,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15014,7 +17715,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13468,13 +14920,13 @@
+@@ -13468,13 +15681,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -15030,7 +17731,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13483,17 +14935,17 @@
+@@ -13483,17 +15696,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -15052,7 +17753,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13512,7 +14964,7 @@
+@@ -13512,7 +15725,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15061,7 +17762,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13533,27 +14985,14 @@
+@@ -13533,27 +15746,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -15091,7 +17792,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13566,36 +15005,33 @@
+@@ -13566,36 +15766,33 @@
;;
solaris*)
case $cc_basename in
@@ -15140,7 +17841,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13603,9 +15039,9 @@
+@@ -13603,9 +15800,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -15152,7 +17853,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13615,9 +15051,9 @@
+@@ -13615,9 +15812,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
@@ -15164,7 +17865,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13626,9 +15062,9 @@
+@@ -13626,9 +15823,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -15176,7 +17877,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13641,12 +15077,63 @@
+@@ -13641,12 +15838,63 @@
;;
esac
;;
@@ -15242,7 +17943,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13666,8 +15153,8 @@
+@@ -13666,8 +15914,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -15253,7 +17954,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13703,7 +15190,7 @@
+@@ -13703,7 +15951,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.
@@ -15262,7 +17963,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13743,7 +15230,7 @@
+@@ -13743,7 +15991,7 @@
fi
;;
@@ -15271,7 +17972,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13779,6 +15266,29 @@
+@@ -13779,6 +16027,29 @@
$rm -f confest.$objext
@@ -15301,7 +18002,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13787,8 +15297,8 @@
+@@ -13787,8 +16058,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -15312,7 +18013,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13826,6 +15336,10 @@
+@@ -13826,6 +16097,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -15323,7 +18024,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13834,7 +15348,7 @@
+@@ -13834,7 +16109,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -15332,7 +18033,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13859,18 +15373,28 @@
+@@ -13859,18 +16134,28 @@
;;
chorus*)
case $cc_basename in
@@ -15364,7 +18065,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13878,22 +15402,22 @@
+@@ -13878,22 +16163,22 @@
;;
esac
;;
@@ -15393,7 +18094,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13906,9 +15430,13 @@
+@@ -13906,9 +16191,13 @@
;;
esac
;;
@@ -15408,7 +18109,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13917,20 +15445,26 @@
+@@ -13917,20 +16206,26 @@
;;
esac
;;
@@ -15439,7 +18140,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13947,25 +15481,25 @@
+@@ -13947,25 +16242,25 @@
;;
mvs*)
case $cc_basename in
@@ -15470,7 +18171,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13979,24 +15513,15 @@
+@@ -13979,24 +16274,15 @@
;;
psos*)
;;
@@ -15497,7 +18198,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14006,12 +15531,12 @@
+@@ -14006,12 +16292,12 @@
;;
sunos4*)
case $cc_basename in
@@ -15512,7 +18213,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14021,7 +15546,7 @@
+@@ -14021,7 +16307,7 @@
;;
tandem*)
case $cc_basename in
@@ -15521,7 +18222,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14029,7 +15554,14 @@
+@@ -14029,7 +16315,14 @@
;;
esac
;;
@@ -15537,7 +18238,7 @@
;;
vxworks*)
;;
-@@ -14039,16 +15571,16 @@
+@@ -14039,16 +16332,16 @@
esac
fi
@@ -15558,7 +18259,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14062,26 +15594,28 @@
+@@ -14062,26 +16355,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 \
@@ -15567,12 +18268,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14068: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15600: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16361: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14072: \$? = $ac_status" >&5
-+ echo "$as_me:15604: \$? = $ac_status" >&5
++ echo "$as_me:16365: \$? = $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
@@ -15594,7 +18295,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14094,7 +15628,7 @@
+@@ -14094,7 +16389,7 @@
fi
fi
@@ -15603,7 +18304,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14104,8 +15638,50 @@
+@@ -14104,8 +16399,50 @@
;;
esac
@@ -15656,7 +18357,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14116,60 +15692,58 @@
+@@ -14116,60 +16453,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -15678,12 +18379,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14135: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15704: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14139: \$? = $ac_status" >&5
-+ echo "$as_me:15708: \$? = $ac_status" >&5
++ echo "$as_me:16469: \$? = $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
@@ -15735,7 +18436,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14179,8 +15753,8 @@
+@@ -14179,8 +16514,8 @@
need_locks=no
fi
@@ -15746,7 +18447,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14197,22 +15771,20 @@
+@@ -14197,22 +16532,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -15775,7 +18476,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14230,8 +15802,8 @@
+@@ -14230,8 +16563,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.
@@ -15786,7 +18487,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14245,6 +15817,7 @@
+@@ -14245,6 +16578,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -15794,7 +18495,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14267,20 +15840,20 @@
+@@ -14267,20 +16601,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15820,7 +18521,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14290,7 +15863,20 @@
+@@ -14290,7 +16624,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15842,7 +18543,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14355,7 +15941,7 @@
+@@ -14355,7 +16702,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15851,7 +18552,7 @@
;;
beos*)
-@@ -14364,7 +15950,7 @@
+@@ -14364,7 +16711,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15860,7 +18561,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14380,7 +15966,7 @@
+@@ -14380,7 +16727,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15869,7 +18570,7 @@
need_version=no
need_lib_prefix=no
-@@ -14392,7 +15978,8 @@
+@@ -14392,7 +16739,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15879,7 +18580,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14422,7 +16009,7 @@
+@@ -14422,7 +16770,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15888,7 +18589,7 @@
;;
esac
;;
-@@ -14445,7 +16032,7 @@
+@@ -14445,7 +16793,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15897,7 +18598,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14468,20 +16055,17 @@
+@@ -14468,20 +16816,17 @@
dynamic_linker=no
;;
@@ -15929,7 +18630,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14499,14 +16083,19 @@
+@@ -14499,14 +16844,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15951,7 +18652,7 @@
esac
;;
-@@ -14526,9 +16115,9 @@
+@@ -14526,9 +16876,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15963,7 +18664,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14543,7 +16132,7 @@
+@@ -14543,7 +16893,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15972,7 +18673,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14554,7 +16143,7 @@
+@@ -14554,7 +16904,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15981,7 +18682,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14566,6 +16155,18 @@
+@@ -14566,6 +16916,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16000,7 +18701,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14609,29 +16210,26 @@
+@@ -14609,29 +16971,26 @@
;;
# This must be Linux ELF.
@@ -16037,7 +18738,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14641,6 +16239,18 @@
+@@ -14641,6 +17000,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16056,7 +18757,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14650,7 +16260,7 @@
+@@ -14650,7 +17021,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16065,7 +18766,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14678,8 +16288,13 @@
+@@ -14678,8 +17049,13 @@
openbsd*)
version_type=sunos
@@ -16080,7 +18781,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14699,7 +16314,7 @@
+@@ -14699,7 +17075,7 @@
os2*)
libname_spec='$name'
@@ -16089,7 +18790,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14717,13 +16332,6 @@
+@@ -14717,13 +17093,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16103,7 +18804,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14749,7 +16357,7 @@
+@@ -14749,7 +17118,7 @@
need_version=yes
;;
@@ -16112,17 +18813,23 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14782,6 +16390,29 @@
+@@ -14782,27 +17151,55 @@
fi
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -16139,10 +18846,14 @@
+ 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}'
-@@ -14793,16 +16424,21 @@
++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
@@ -16170,7 +18881,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14822,8 +16458,8 @@
+@@ -14822,8 +17219,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -16181,7 +18892,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14834,1152 +16470,327 @@
+@@ -14834,1001 +17231,176 @@
enable_fast_install=needless
fi
@@ -16790,9 +19501,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -16834,10 +19543,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-
+-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -16862,9 +19568,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -16906,9 +19610,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
+-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -16920,75 +19622,42 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-
+-
+-
-fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-
+-
+-
-fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
+-
+-
-fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-
+-
+-
-fi
-+# Do we need a version for libraries?
-+need_version=$need_version
-
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-
+-
+-
-fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
+-
- ;;
- esac
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-
+-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
+-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
+-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
+-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -17002,19 +19671,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15471 "configure"
-#include "confdefs.h"
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Library versioning type.
-+version_type=$version_type
-
+-
-#include <stdio.h>
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -17024,10 +19687,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-
+-
-/* 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
@@ -17049,35 +19709,24 @@
-# endif
-# endif
-#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
+-
- exit (status);
-}
-EOF
@@ -17099,23 +19748,12 @@
- fi
-fi
-rm -fr conftest*
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
+-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-
+-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -17131,22 +19769,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15569 "configure"
-#include "confdefs.h"
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
+-
-#include <stdio.h>
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -17156,10 +19785,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -17181,33 +19807,24 @@
-# endif
-# endif
-#endif
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- exit (status);
-}
-EOF
@@ -17229,43 +19846,31 @@
- fi
-fi
-rm -fr conftest*
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-
+-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-
+-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
+-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
+-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-
+-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -17425,163 +20030,30 @@
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+@@ -15844,7 +17416,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
-shrext='$shrext'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
--
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -15859,7 +17431,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
-# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_CXX
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
- # This is the shared library path variable.
- shlibpath_var=$shlibpath_var
-@@ -16061,7 +16872,10 @@
+ # Do we need the lib prefix for modules?
+@@ -16061,7 +17633,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.
@@ -17593,7 +20065,7 @@
fi
-@@ -16133,29 +16947,55 @@
+@@ -16133,29 +17708,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -17633,19 +20105,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
@@ -17657,7 +20129,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16163,21 +17003,21 @@
+@@ -16163,21 +17764,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -17689,7 +20161,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16186,8 +17026,8 @@
+@@ -16186,8 +17787,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -17700,7 +20172,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16225,6 +17065,11 @@
+@@ -16225,6 +17826,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17712,7 +20184,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16241,7 +17086,7 @@
+@@ -16241,7 +17847,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17721,7 +20193,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16267,6 +17112,16 @@
+@@ -16267,6 +17873,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -17738,7 +20210,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16278,7 +17133,7 @@
+@@ -16278,7 +17894,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.
@@ -17747,7 +20219,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16301,13 +17156,20 @@
+@@ -16301,13 +17917,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17770,7 +20242,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16322,15 +17184,15 @@
+@@ -16322,15 +17945,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17792,7 +20264,7 @@
;;
sunos4*)
-@@ -16339,7 +17201,7 @@
+@@ -16339,7 +17962,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17801,7 +20273,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16352,6 +17214,17 @@
+@@ -16352,6 +17975,17 @@
fi
;;
@@ -17819,7 +20291,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16363,16 +17236,16 @@
+@@ -16363,16 +17997,16 @@
esac
fi
@@ -17840,7 +20312,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16386,26 +17259,28 @@
+@@ -16386,26 +18020,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 \
@@ -17849,12 +20321,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16392: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17265: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18026: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16396: \$? = $ac_status" >&5
-+ echo "$as_me:17269: \$? = $ac_status" >&5
++ echo "$as_me:18030: \$? = $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
@@ -17876,7 +20348,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16418,7 +17293,7 @@
+@@ -16418,7 +18054,7 @@
fi
fi
@@ -17885,12 +20357,13 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16428,8 +17303,50 @@
+@@ -16428,24 +18064,59 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -17898,8 +20371,14 @@
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_cv_prog_compiler_c_o_F77=no
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+- cd conftest
+- mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17925,7 +20404,13 @@
+fi
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-+
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
+else
@@ -17935,23 +20420,19 @@
+
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16440,60 +17357,58 @@
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_prog_compiler_c_o_F77=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
+@@ -16453,47 +18124,52 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -17960,12 +20441,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16459: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17369: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18130: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16463: \$? = $ac_status" >&5
-+ echo "$as_me:17373: \$? = $ac_status" >&5
++ echo "$as_me:18134: \$? = $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
@@ -18017,7 +20498,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16503,8 +17418,8 @@
+@@ -16503,8 +18179,8 @@
need_locks=no
fi
@@ -18028,7 +20509,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16542,6 +17457,16 @@
+@@ -16542,6 +18218,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -18045,7 +20526,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16552,6 +17477,10 @@
+@@ -16552,6 +18238,10 @@
with_gnu_ld=no
fi
;;
@@ -18056,7 +20537,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16562,6 +17491,27 @@
+@@ -16562,6 +18252,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -18084,7 +20565,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16599,7 +17549,7 @@
+@@ -16599,7 +18310,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -18093,7 +20574,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16609,13 +17559,13 @@
+@@ -16609,13 +18320,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'
@@ -18110,7 +20591,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16624,23 +17574,70 @@
+@@ -16624,23 +18335,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18187,7 +20668,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16654,13 +17651,40 @@
+@@ -16654,13 +18412,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18230,7 +20711,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16670,24 +17694,19 @@
+@@ -16670,24 +18455,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18262,7 +20743,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16699,7 +17718,7 @@
+@@ -16699,7 +18479,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -18271,7 +20752,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16721,9 +17740,21 @@
+@@ -16721,9 +18501,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
@@ -18295,7 +20776,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16740,7 +17771,7 @@
+@@ -16740,7 +18532,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -18304,7 +20785,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16759,8 +17790,12 @@
+@@ -16759,8 +18551,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -18317,7 +20798,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16768,22 +17803,23 @@
+@@ -16768,45 +18564,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -18348,14 +20829,58 @@
program main
end
-@@ -16820,19 +17856,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16820,19 +18629,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -18373,17 +20898,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16872,7 +17909,9 @@
+@@ -16841,24 +18651,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -16872,8 +18694,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16882,13 +17921,11 @@
+
+@@ -16882,13 +18706,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -18400,7 +20972,7 @@
fi
fi
;;
-@@ -16901,7 +17938,7 @@
+@@ -16901,7 +18723,7 @@
ld_shlibs_F77=no
;;
@@ -18409,7 +20981,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16911,68 +17948,68 @@
+@@ -16911,68 +18733,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -18522,7 +21094,7 @@
fi
;;
-@@ -17006,8 +18043,8 @@
+@@ -17006,8 +18828,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18533,7 +21105,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17015,7 +18052,7 @@
+@@ -17015,7 +18837,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -18542,7 +21114,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -17029,47 +18066,62 @@
+@@ -17029,47 +18851,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -18629,7 +21201,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17083,7 +18135,7 @@
+@@ -17083,7 +18920,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18638,7 +21210,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17093,7 +18145,7 @@
+@@ -17093,7 +18930,7 @@
link_all_deplibs_F77=yes
;;
@@ -18647,7 +21219,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17116,7 +18168,8 @@
+@@ -17116,7 +18953,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
@@ -18657,7 +21229,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17126,7 +18179,7 @@
+@@ -17126,7 +18964,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -18666,7 +21238,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17137,14 +18190,14 @@
+@@ -17137,14 +18975,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -18683,7 +21255,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17156,13 +18209,13 @@
+@@ -17156,13 +18994,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -18699,7 +21271,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17170,21 +18223,15 @@
+@@ -17170,21 +19008,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -18725,7 +21297,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17193,8 +18240,18 @@
+@@ -17193,8 +19025,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -18746,7 +21318,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17203,7 +18260,7 @@
+@@ -17203,7 +19045,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.
@@ -18755,7 +21327,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17251,36 +18308,45 @@
+@@ -17251,36 +19093,45 @@
fi
;;
@@ -18822,7 +21394,7 @@
;;
uts4*)
-@@ -17295,15 +18361,10 @@
+@@ -17295,15 +19146,10 @@
esac
fi
@@ -18840,7 +21412,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17321,8 +18382,8 @@
+@@ -17321,8 +19167,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.
@@ -18851,7 +21423,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17336,6 +18397,7 @@
+@@ -17336,6 +19182,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -18859,7 +21431,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17358,20 +18420,20 @@
+@@ -17358,20 +19205,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18885,7 +21457,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17381,7 +18443,20 @@
+@@ -17381,7 +19228,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18907,7 +21479,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17446,7 +18521,7 @@
+@@ -17446,7 +19306,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18916,7 +21488,7 @@
;;
beos*)
-@@ -17455,7 +18530,7 @@
+@@ -17455,7 +19315,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18925,7 +21497,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17471,7 +18546,7 @@
+@@ -17471,7 +19331,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18934,7 +21506,7 @@
need_version=no
need_lib_prefix=no
-@@ -17483,7 +18558,8 @@
+@@ -17483,7 +19343,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18944,7 +21516,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17513,7 +18589,7 @@
+@@ -17513,7 +19374,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18953,7 +21525,7 @@
;;
esac
;;
-@@ -17536,7 +18612,7 @@
+@@ -17536,7 +19397,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18962,7 +21534,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17559,20 +18635,17 @@
+@@ -17559,20 +19420,17 @@
dynamic_linker=no
;;
@@ -18994,7 +21566,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17590,14 +18663,19 @@
+@@ -17590,14 +19448,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19016,7 +21588,7 @@
esac
;;
-@@ -17617,9 +18695,9 @@
+@@ -17617,9 +19480,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19028,7 +21600,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17634,7 +18712,7 @@
+@@ -17634,7 +19497,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19037,7 +21609,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17645,7 +18723,7 @@
+@@ -17645,7 +19508,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19046,7 +21618,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17657,6 +18735,18 @@
+@@ -17657,6 +19520,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19065,7 +21637,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17700,29 +18790,26 @@
+@@ -17700,29 +19575,26 @@
;;
# This must be Linux ELF.
@@ -19102,17 +21674,14 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17732,16 +18819,28 @@
+@@ -17732,6 +19604,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--netbsd*)
-- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
- need_lib_prefix=no
- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ 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
@@ -19121,12 +21690,10 @@
+ dynamic_linker='NetBSD ld.elf_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'
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -17741,7 +19625,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19135,7 +21702,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17769,8 +18868,13 @@
+@@ -17769,8 +19653,13 @@
openbsd*)
version_type=sunos
@@ -19150,7 +21717,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17790,7 +18894,7 @@
+@@ -17790,7 +19679,7 @@
os2*)
libname_spec='$name'
@@ -19159,7 +21726,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17808,13 +18912,6 @@
+@@ -17808,13 +19697,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19173,7 +21740,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17840,7 +18937,7 @@
+@@ -17840,7 +19722,7 @@
need_version=yes
;;
@@ -19182,7 +21749,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17873,6 +18970,29 @@
+@@ -17873,6 +19755,29 @@
fi
;;
@@ -19212,7 +21779,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17884,16 +19004,21 @@
+@@ -17884,16 +19789,21 @@
dynamic_linker=no
;;
esac
@@ -19240,7 +21807,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17913,8 +19038,8 @@
+@@ -17913,8 +19823,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -19251,7 +21818,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17925,36 +19050,6 @@
+@@ -17925,36 +19835,6 @@
enable_fast_install=needless
fi
@@ -19288,7 +21855,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17969,7 +19064,8 @@
+@@ -17969,7 +19849,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.
@@ -19298,7 +21865,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18069,6 +19165,12 @@
+@@ -18069,6 +19950,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -19311,7 +21878,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18080,6 +19182,9 @@
+@@ -18080,6 +19967,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -19321,7 +21888,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18099,7 +19204,7 @@
+@@ -18099,7 +19989,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -19330,7 +21897,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18130,7 +19235,7 @@
+@@ -18130,7 +20020,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19339,7 +21906,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18145,7 +19250,7 @@
+@@ -18145,7 +20035,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -19348,7 +21915,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18347,7 +19452,10 @@
+@@ -18347,7 +20237,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.
@@ -19360,7 +21927,7 @@
fi
-@@ -18368,7 +19476,6 @@
+@@ -18368,7 +20261,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -19368,7 +21935,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18380,26 +19487,55 @@
+@@ -18380,26 +20272,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -19425,7 +21992,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18411,8 +19547,8 @@
+@@ -18411,8 +20332,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -19436,7 +22003,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18426,26 +19562,28 @@
+@@ -18426,26 +20347,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 \
@@ -19445,12 +22012,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18432: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19568: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20353: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18436: \$? = $ac_status" >&5
-+ echo "$as_me:19572: \$? = $ac_status" >&5
++ echo "$as_me:20357: \$? = $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
@@ -19472,7 +22039,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18459,8 +19597,8 @@
+@@ -18459,8 +20382,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -19483,7 +22050,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18498,6 +19636,11 @@
+@@ -18498,6 +20421,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -19495,7 +22062,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18514,7 +19657,7 @@
+@@ -18514,7 +20442,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19504,7 +22071,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18540,6 +19683,16 @@
+@@ -18540,6 +20468,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -19521,7 +22088,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18551,7 +19704,7 @@
+@@ -18551,7 +20489,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.
@@ -19530,7 +22097,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18574,13 +19727,20 @@
+@@ -18574,13 +20512,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19553,7 +22120,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18595,15 +19755,15 @@
+@@ -18595,15 +20540,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -19575,7 +22142,7 @@
;;
sunos4*)
-@@ -18612,7 +19772,7 @@
+@@ -18612,7 +20557,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19584,7 +22151,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18625,6 +19785,17 @@
+@@ -18625,6 +20570,17 @@
fi
;;
@@ -19602,7 +22169,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18636,16 +19807,16 @@
+@@ -18636,16 +20592,16 @@
esac
fi
@@ -19623,7 +22190,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18659,26 +19830,28 @@
+@@ -18659,26 +20615,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 \
@@ -19632,12 +22199,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18665: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19836: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20621: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18669: \$? = $ac_status" >&5
-+ echo "$as_me:19840: \$? = $ac_status" >&5
++ echo "$as_me:20625: \$? = $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
@@ -19659,7 +22226,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18691,7 +19864,7 @@
+@@ -18691,7 +20649,7 @@
fi
fi
@@ -19668,7 +22235,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18701,8 +19874,50 @@
+@@ -18701,8 +20659,50 @@
;;
esac
@@ -19721,7 +22288,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18713,60 +19928,58 @@
+@@ -18713,60 +20713,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -19743,12 +22310,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19940: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20725: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18736: \$? = $ac_status" >&5
-+ echo "$as_me:19944: \$? = $ac_status" >&5
++ echo "$as_me:20729: \$? = $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
@@ -19800,7 +22367,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18776,8 +19989,8 @@
+@@ -18776,8 +20774,8 @@
need_locks=no
fi
@@ -19811,7 +22378,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18815,6 +20028,16 @@
+@@ -18815,6 +20813,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -19828,7 +22395,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18825,6 +20048,10 @@
+@@ -18825,6 +20833,10 @@
with_gnu_ld=no
fi
;;
@@ -19839,7 +22406,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18835,6 +20062,27 @@
+@@ -18835,6 +20847,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -19867,7 +22434,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18872,7 +20120,7 @@
+@@ -18872,7 +20905,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -19876,7 +22443,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18882,13 +20130,13 @@
+@@ -18882,13 +20915,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'
@@ -19893,7 +22460,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18897,23 +20145,70 @@
+@@ -18897,23 +20930,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -19902,9 +22469,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ interix3*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
@@ -19949,10 +22517,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -19970,7 +22537,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18927,13 +20222,40 @@
+@@ -18927,13 +21007,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20013,7 +22580,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18943,24 +20265,19 @@
+@@ -18943,24 +21050,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20045,7 +22612,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18972,7 +20289,7 @@
+@@ -18972,7 +21074,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -20054,7 +22621,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18994,9 +20311,21 @@
+@@ -18994,9 +21096,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
@@ -20078,7 +22645,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19013,7 +20342,7 @@
+@@ -19013,7 +21127,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -20087,7 +22654,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -19032,8 +20361,12 @@
+@@ -19032,8 +21146,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -20100,7 +22667,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19041,22 +20374,23 @@
+@@ -19041,22 +21159,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20131,14 +22698,60 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19103,19 +20437,20 @@
+@@ -19072,24 +21191,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -19103,19 +21234,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -20156,17 +22769,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19165,7 +20500,9 @@
+@@ -19134,24 +21266,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -19165,8 +21309,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19175,13 +20512,11 @@
+
+@@ -19175,13 +21321,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -20183,7 +22843,7 @@
fi
fi
;;
-@@ -19194,7 +20529,7 @@
+@@ -19194,7 +21338,7 @@
ld_shlibs_GCJ=no
;;
@@ -20192,7 +22852,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19204,68 +20539,68 @@
+@@ -19204,68 +21348,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -20305,7 +22965,7 @@
fi
;;
-@@ -19299,8 +20634,8 @@
+@@ -19299,8 +21443,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20316,7 +22976,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19308,7 +20643,7 @@
+@@ -19308,7 +21452,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -20325,7 +22985,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19322,47 +20657,62 @@
+@@ -19322,47 +21466,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -20412,7 +23072,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19376,7 +20726,7 @@
+@@ -19376,7 +21535,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -20421,7 +23081,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19386,7 +20736,7 @@
+@@ -19386,7 +21545,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -20430,7 +23090,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19409,7 +20759,8 @@
+@@ -19409,7 +21568,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
@@ -20440,7 +23100,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19419,7 +20770,7 @@
+@@ -19419,7 +21579,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -20449,7 +23109,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19430,14 +20781,14 @@
+@@ -19430,14 +21590,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -20466,7 +23126,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19449,13 +20800,13 @@
+@@ -19449,13 +21609,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -20482,7 +23142,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19463,21 +20814,15 @@
+@@ -19463,21 +21623,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -20508,7 +23168,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19486,8 +20831,18 @@
+@@ -19486,8 +21640,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20529,7 +23189,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19496,7 +20851,7 @@
+@@ -19496,7 +21660,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.
@@ -20538,7 +23198,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19544,36 +20899,45 @@
+@@ -19544,36 +21708,45 @@
fi
;;
@@ -20605,7 +23265,7 @@
;;
uts4*)
-@@ -19588,15 +20952,10 @@
+@@ -19588,15 +21761,10 @@
esac
fi
@@ -20623,7 +23283,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19614,8 +20973,8 @@
+@@ -19614,8 +21782,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.
@@ -20634,7 +23294,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19629,6 +20988,7 @@
+@@ -19629,6 +21797,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -20642,7 +23302,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19651,20 +21011,20 @@
+@@ -19651,20 +21820,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -20668,7 +23328,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19674,7 +21034,20 @@
+@@ -19674,7 +21843,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20690,7 +23350,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19739,7 +21112,7 @@
+@@ -19739,7 +21921,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20699,7 +23359,7 @@
;;
beos*)
-@@ -19748,7 +21121,7 @@
+@@ -19748,7 +21930,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -20708,7 +23368,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19764,7 +21137,7 @@
+@@ -19764,7 +21946,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -20717,7 +23377,7 @@
need_version=no
need_lib_prefix=no
-@@ -19776,7 +21149,8 @@
+@@ -19776,7 +21958,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -20727,7 +23387,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19806,7 +21180,7 @@
+@@ -19806,7 +21989,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20736,7 +23396,7 @@
;;
esac
;;
-@@ -19829,7 +21203,7 @@
+@@ -19829,7 +22012,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -20745,7 +23405,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19852,20 +21226,17 @@
+@@ -19852,20 +22035,17 @@
dynamic_linker=no
;;
@@ -20777,7 +23437,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19883,14 +21254,19 @@
+@@ -19883,14 +22063,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -20799,7 +23459,7 @@
esac
;;
-@@ -19910,9 +21286,9 @@
+@@ -19910,9 +22095,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -20811,7 +23471,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19927,7 +21303,7 @@
+@@ -19927,7 +22112,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -20820,7 +23480,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19938,7 +21314,7 @@
+@@ -19938,7 +22123,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -20829,7 +23489,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19950,6 +21326,18 @@
+@@ -19950,6 +22135,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -20848,17 +23508,18 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19993,1064 +21381,264 @@
+@@ -19993,29 +22190,26 @@
;;
# This must be Linux ELF.
-linux*)
-- 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'
++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'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -20866,100 +23527,80 @@
- 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
--
-- # 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
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -20025,6 +22219,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20034,7 +22240,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${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
-- ;;
--
--nto-qnx*)
-- version_type=linux
-- need_lib_prefix=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='NetBSD ld.elf_so'
+ fi
+@@ -20062,8 +22268,13 @@
+
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ 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
-- ;;
--
--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'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -20083,7 +22294,7 @@
+
+ os2*)
+ libname_spec='$name'
- shrext=".dll"
-- 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"
-- ;;
--
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -20101,13 +22312,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
@@ -20967,70 +23608,32 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--solaris*)
-+linux* | k*bsd*-gnu)
+ solaris*)
version_type=linux
need_lib_prefix=no
- need_version=no
+@@ -20133,7 +22337,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- # ldd complains unless libraries are executable
-- postinstall_cmds='chmod +x $lib'
-- ;;
--
--sunos4*)
-- version_type=sunos
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- if test "$with_gnu_ld" = yes; then
-- need_lib_prefix=no
-- fi
-- need_version=yes
-- ;;
--
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_vendor in
-- sni)
-- shlibpath_overrides_runpath=no
-- need_lib_prefix=no
-- export_dynamic_flag_spec='${wl}-Blargedynsym'
-- runpath_var=LD_RUN_PATH
-- ;;
-- siemens)
-- need_lib_prefix=no
-- ;;
-- motorola)
-- need_lib_prefix=no
-- need_version=no
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-- ;;
-- esac
-- ;;
--
--sysv4*MP*)
-- if test -d /usr/nec ;then
-- version_type=linux
-- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-- soname_spec='$libname${shared_ext}.$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- fi
-- ;;
--
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -20166,891 +22370,84 @@
+ fi
+ ;;
+
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
++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
- ;;
-
-*)
@@ -21671,111 +24274,29 @@
-
-
-fi
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # 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
-+ ;;
-
+-
- ;;
-+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
+- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-+ 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
++ 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
- enable_dlopen=no
-+ shlibpath_overrides_runpath=yes
- fi
-+ ;;
-
+- fi
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -21806,15 +24327,7 @@
-#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
@@ -21824,17 +24337,7 @@
-# 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
@@ -21856,78 +24359,24 @@
-# 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
@@ -21942,29 +24391,11 @@
- 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 ;;
-+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=no
- fi
+- fi
-fi
-rm -fr conftest*
-
@@ -22030,35 +24461,20 @@
-#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
@@ -22077,13 +24493,47 @@
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
-- fi
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
+ fi
+-fi
+-rm -fr conftest*
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
++*)
++ dynamic_linker=no
++ ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+
+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
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
@@ -22091,6 +24541,10 @@
+ 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
@@ -22108,21 +24562,7 @@
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
- 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
++fi
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
@@ -22140,7 +24580,7 @@
fi
-@@ -21067,7 +21655,8 @@
+@@ -21067,7 +22464,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.
@@ -22150,7 +24590,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21167,6 +21756,12 @@
+@@ -21167,6 +22565,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22163,7 +24603,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21178,6 +21773,9 @@
+@@ -21178,6 +22582,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22173,7 +24613,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21197,7 +21795,7 @@
+@@ -21197,7 +22604,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22182,7 +24622,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21228,7 +21826,7 @@
+@@ -21228,7 +22635,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22191,7 +24631,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21243,7 +21841,7 @@
+@@ -21243,7 +22650,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -22200,7 +24640,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21445,7 +22043,10 @@
+@@ -21445,7 +22852,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.
@@ -22212,7 +24652,7 @@
fi
-@@ -21465,7 +22066,6 @@
+@@ -21465,7 +22875,6 @@
RC)
@@ -22220,7 +24660,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21484,15 +22084,42 @@
+@@ -21484,15 +22893,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22263,7 +24703,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21508,7 +22135,8 @@
+@@ -21508,7 +22944,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.
@@ -22273,7 +24713,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21608,6 +22236,12 @@
+@@ -21608,6 +23045,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22286,7 +24726,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21619,6 +22253,9 @@
+@@ -21619,6 +23062,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22296,7 +24736,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21638,7 +22275,7 @@
+@@ -21638,7 +23084,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22305,7 +24745,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21669,7 +22306,7 @@
+@@ -21669,7 +23115,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22314,7 +24754,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21684,7 +22321,7 @@
+@@ -21684,7 +23130,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -22323,7 +24763,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21886,7 +22523,10 @@
+@@ -21886,7 +23332,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.
@@ -22335,7 +24775,7 @@
fi
-@@ -21933,7 +22573,7 @@
+@@ -21933,7 +23382,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -22344,7 +24784,7 @@
# Prevent multiple expansion
-@@ -21988,8 +22628,8 @@
+@@ -21988,8 +23437,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -22355,7 +24795,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22015,17 +22655,17 @@
+@@ -22015,17 +23464,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -22379,7 +24819,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22040,32 +22680,33 @@
+@@ -22040,32 +23489,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22421,7 +24861,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22074,8 +22715,8 @@
+@@ -22074,8 +23524,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -22432,7 +24872,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22101,11 +22742,11 @@
+@@ -22101,11 +23551,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -22448,7 +24888,7 @@
fi
-@@ -22113,8 +22754,8 @@
+@@ -22113,8 +23563,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -22459,7 +24899,7 @@
XGETTEXT=":"
fi
fi
-@@ -22124,8 +22765,7 @@
+@@ -22124,8 +23574,7 @@
@@ -22469,7 +24909,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22137,8 +22777,8 @@
+@@ -22137,8 +23586,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -22480,15 +24920,61 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22192,15 +22832,16 @@
+@@ -22166,24 +23615,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22192,15 +23653,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_stl_works=no
+ kde_cv_stl_works=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -22500,7 +24986,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22229,15 +22870,14 @@
+@@ -22229,15 +23691,14 @@
@@ -22519,7 +25005,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22249,9 +22889,6 @@
+@@ -22249,9 +23710,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22529,18 +25015,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22303,8 +22940,9 @@
+@@ -22277,24 +23735,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22303,9 +23773,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcat=no
+ kde_cv_func_strlcat=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22318,11 +22956,11 @@
+ ac_ext=c
+@@ -22318,11 +23789,11 @@
fi
@@ -22556,7 +25089,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22343,8 +22981,7 @@
+@@ -22343,8 +23814,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -22566,7 +25099,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22409,9 +23046,10 @@
+@@ -22382,24 +23852,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22409,10 +23891,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22574,11 +25152,13 @@
+ kde_cv_proto_strlcat="strlcat unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22425,8 +23063,8 @@
+ ac_ext=c
+@@ -22425,8 +23908,8 @@
fi
@@ -22589,7 +25169,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22450,15 +23088,14 @@
+@@ -22450,15 +23933,14 @@
@@ -22608,7 +25188,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22470,9 +23107,6 @@
+@@ -22470,9 +23952,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22618,18 +25198,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22523,8 +23157,9 @@
+@@ -22497,24 +23976,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22523,9 +24014,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcpy=no
+ kde_cv_func_strlcpy=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22538,11 +23173,11 @@
+ ac_ext=c
+@@ -22538,11 +24030,11 @@
fi
@@ -22645,7 +25272,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22563,8 +23198,7 @@
+@@ -22563,8 +24055,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -22655,7 +25282,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22628,9 +23262,10 @@
+@@ -22601,24 +24092,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22628,10 +24131,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22663,11 +25335,13 @@
+ kde_cv_proto_strlcpy="strlcpy unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22644,8 +23279,8 @@
+ ac_ext=c
+@@ -22644,8 +24148,8 @@
fi
@@ -22678,7 +25352,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22668,8 +23303,8 @@
+@@ -22668,8 +24172,8 @@
@@ -22689,7 +25363,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22686,7 +23321,7 @@
+@@ -22686,30 +24190,42 @@
int
main ()
{
@@ -22698,15 +25372,59 @@
;
return 0;
}
-@@ -22718,20 +23353,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22718,20 +24234,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_util_main=no
+ ac_cv_lib_util_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22725,7 +25443,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22748,7 +23384,7 @@
+@@ -22748,30 +24265,42 @@
int
main ()
{
@@ -22734,15 +25452,59 @@
;
return 0;
}
-@@ -22780,21 +23416,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22780,21 +24309,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
+ ac_cv_lib_compat_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22762,7 +25524,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22807,17 +23444,17 @@
+@@ -22807,40 +24337,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22784,15 +25546,59 @@
;
return 0;
}
-@@ -22849,19 +23486,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22849,19 +24391,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
+ ac_cv_lib_crypt_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22810,7 +25616,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22874,17 +23512,17 @@
+@@ -22874,40 +24417,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22832,15 +25638,59 @@
;
return 0;
}
-@@ -22916,14 +23554,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -22916,14 +24471,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_crypt=no
+ ac_cv_lib_c_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22851,7 +25701,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22949,13 +23588,13 @@
+@@ -22949,13 +24505,13 @@
fi
@@ -22868,17 +25718,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23013,7 +23652,9 @@
+@@ -22984,24 +24540,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23013,8 +24581,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23024,17 +23665,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23024,17 +24594,17 @@
fi
@@ -22901,17 +25798,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23092,7 +23733,9 @@
+@@ -23063,24 +24633,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23092,8 +24674,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -23104,8 +23747,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23104,8 +24688,8 @@
fi
@@ -22922,7 +25866,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23118,8 +23761,8 @@
+@@ -23118,8 +24702,8 @@
_ACEOF
@@ -22933,7 +25877,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23132,17 +23775,17 @@
+@@ -23132,40 +24716,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22955,15 +25899,59 @@
;
return 0;
}
-@@ -23174,21 +23817,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23174,21 +24770,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22983,7 +25971,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23201,17 +23845,17 @@
+@@ -23201,40 +24798,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23005,15 +25993,59 @@
;
return 0;
}
-@@ -23243,21 +23887,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23243,21 +24852,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23033,7 +26065,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23284,30 +23929,24 @@
+@@ -23284,53 +24894,59 @@
#undef inet_ntoa
@@ -23069,15 +26101,59 @@
;
return 0;
}
-@@ -23339,17 +23978,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23339,17 +24955,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_inet_ntoa=no
+ ac_cv_func_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -23093,7 +26169,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23362,17 +24002,17 @@
+@@ -23362,40 +24979,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23115,15 +26191,59 @@
;
return 0;
}
-@@ -23404,21 +24044,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23404,21 +25033,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_inet_ntoa=no
+ ac_cv_lib_nsl_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23143,7 +26263,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23445,30 +24086,24 @@
+@@ -23445,53 +25075,59 @@
#undef connect
@@ -23179,15 +26299,59 @@
;
return 0;
}
-@@ -23500,17 +24135,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23500,17 +25136,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
+ ac_cv_func_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -23203,7 +26367,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23523,17 +24159,17 @@
+@@ -23523,40 +25160,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23225,15 +26389,59 @@
;
return 0;
}
-@@ -23565,22 +24201,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23565,22 +25214,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23254,7 +26462,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23607,30 +24244,24 @@
+@@ -23607,53 +25257,59 @@
#undef remove
@@ -23290,15 +26498,59 @@
;
return 0;
}
-@@ -23662,17 +24293,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23662,17 +25318,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
+ ac_cv_func_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -23314,7 +26566,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23685,17 +24317,17 @@
+@@ -23685,40 +25342,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23336,15 +26588,59 @@
;
return 0;
}
-@@ -23727,14 +24359,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23727,14 +25396,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23355,7 +26651,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23742,8 +24375,8 @@
+@@ -23742,8 +25412,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -23366,7 +26662,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23770,30 +24403,24 @@
+@@ -23770,53 +25440,59 @@
#undef shmat
@@ -23402,15 +26698,59 @@
;
return 0;
}
-@@ -23825,18 +24452,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23825,18 +25501,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
+ ac_cv_func_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -23427,7 +26767,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23849,17 +24477,17 @@
+@@ -23849,40 +25526,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23449,15 +26789,59 @@
;
return 0;
}
-@@ -23891,14 +24519,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23891,14 +25580,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23468,7 +26852,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23912,18 +24541,19 @@
+@@ -23912,18 +25602,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23496,17 +26880,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23960,15 +24590,16 @@
+@@ -23934,24 +25625,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23960,15 +25663,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -23518,7 +26948,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24002,9 +24633,10 @@
+@@ -23977,8 +25681,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24002,9 +25711,10 @@
ac_header_preproc=no
fi
@@ -23531,7 +26977,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24028,25 +24660,19 @@
+@@ -24028,25 +25738,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;}
@@ -23564,7 +27010,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24064,18 +24690,19 @@
+@@ -24064,18 +25768,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23592,17 +27038,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24112,15 +24739,16 @@
+@@ -24086,24 +25791,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24112,15 +25829,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -23614,7 +27106,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24154,9 +24782,10 @@
+@@ -24129,8 +25847,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24154,9 +25877,10 @@
ac_header_preproc=no
fi
@@ -23627,7 +27135,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24180,25 +24809,19 @@
+@@ -24180,25 +25904,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;}
@@ -23660,7 +27168,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24212,8 +24835,8 @@
+@@ -24212,8 +25930,8 @@
# darwin requires a poll emulation library
@@ -23671,7 +27179,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24226,17 +24849,17 @@
+@@ -24226,40 +25944,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23693,15 +27201,59 @@
;
return 0;
}
-@@ -24268,14 +24891,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24268,14 +25998,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_poll_poll=no
+ ac_cv_lib_poll_poll=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -23712,7 +27264,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24286,18 +24910,19 @@
+@@ -24286,18 +26017,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23740,17 +27292,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24334,15 +24959,16 @@
+@@ -24308,24 +26040,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24334,15 +26078,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -23762,7 +27360,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24376,9 +25002,10 @@
+@@ -24351,8 +26096,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24376,9 +26126,10 @@
ac_header_preproc=no
fi
@@ -23775,7 +27389,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24402,25 +25029,19 @@
+@@ -24402,25 +26153,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;}
@@ -23808,7 +27422,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24435,17 +25056,17 @@
+@@ -24435,17 +26180,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -23832,17 +27446,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24482,15 +25103,16 @@
+@@ -24456,24 +26201,36 @@
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24482,15 +26239,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -23854,7 +27514,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24524,9 +25146,10 @@
+@@ -24499,8 +26257,13 @@
+ /* end confdefs.h. */
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -24524,9 +26287,10 @@
ac_header_preproc=no
fi
@@ -23867,7 +27543,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24550,25 +25173,18 @@
+@@ -24550,25 +26314,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;}
@@ -23898,7 +27574,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24585,8 +25201,8 @@
+@@ -24585,8 +26342,8 @@
@@ -23909,7 +27585,50 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24635,8 +25251,8 @@
+@@ -24612,31 +26369,43 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBRESOLV="-lresolv"
@@ -23920,7 +27639,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24647,25 +25263,25 @@
+@@ -24647,25 +26416,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23930,8 +27649,9 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -23952,7 +27672,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24677,9 +25293,6 @@
+@@ -24677,9 +26446,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -23962,18 +27682,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24731,8 +25344,9 @@
+@@ -24705,24 +26471,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24731,9 +26509,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_res_init=no
+ kde_cv_func_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -24746,11 +25360,11 @@
+ ac_ext=c
+@@ -24746,11 +26525,11 @@
fi
@@ -23989,7 +27756,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24771,8 +25385,7 @@
+@@ -24771,8 +26550,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -23999,7 +27766,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24837,9 +25450,10 @@
+@@ -24810,24 +26588,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24837,10 +26627,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24007,11 +27819,13 @@
+ kde_cv_proto_res_init="res_init unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -24853,8 +25467,8 @@
+ ac_ext=c
+@@ -24853,8 +26644,8 @@
fi
@@ -24022,7 +27836,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24881,8 +25495,8 @@
+@@ -24881,8 +26672,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -24033,7 +27847,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24895,17 +25509,17 @@
+@@ -24895,40 +26686,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24055,15 +27869,59 @@
;
return 0;
}
-@@ -24937,27 +25551,28 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24937,27 +26740,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ucb_killpg=no
+ ac_cv_lib_ucb_killpg=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24093,7 +27951,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24970,17 +25585,17 @@
+@@ -24970,40 +26774,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24115,15 +27973,59 @@
;
return 0;
}
-@@ -25012,22 +25627,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25012,22 +26828,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -24144,7 +28046,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25038,12 +25654,13 @@
+@@ -25038,36 +26855,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24160,15 +28062,60 @@
return 0;
;
return 0;
-@@ -25076,20 +25693,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25076,20 +26906,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
+ ac_cv_type_int=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -24188,7 +28135,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25102,10 +25720,11 @@
+@@ -25102,10 +26933,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24201,7 +28148,52 @@
test_array [0] = 0
;
-@@ -25143,10 +25762,11 @@
+@@ -25113,24 +26945,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25143,10 +26987,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24214,7 +28206,52 @@
test_array [0] = 0
;
-@@ -25180,30 +25800,32 @@
+@@ -25154,24 +26999,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25180,30 +27037,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24231,8 +28268,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24255,7 +28293,52 @@
test_array [0] = 0
;
-@@ -25241,10 +25863,11 @@
+@@ -25211,24 +27070,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25241,10 +27112,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24268,7 +28351,52 @@
test_array [0] = 0
;
-@@ -25278,23 +25901,26 @@
+@@ -25252,24 +27124,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25278,24 +27162,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24285,8 +28413,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24295,14 +28424,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25306,10 +25932,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25306,10 +27193,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24315,15 +28447,61 @@
test_array [0] = 0
;
-@@ -25343,26 +25970,20 @@
+@@ -25317,24 +27205,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25343,26 +27243,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -24347,7 +28525,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25370,8 +25991,9 @@
+@@ -25370,8 +27264,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24359,7 +28537,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25380,22 +26002,22 @@
+@@ -25380,35 +27275,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24391,7 +28569,33 @@
;
return 0;
-@@ -25419,28 +26041,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25419,28 +27323,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24428,7 +28632,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25451,12 +26072,13 @@
+@@ -25451,36 +27354,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24444,15 +28648,60 @@
return 0;
;
return 0;
-@@ -25489,20 +26111,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25489,20 +27405,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
+ ac_cv_type_short=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -24472,7 +28721,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25515,10 +26138,11 @@
+@@ -25515,10 +27432,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24485,7 +28734,52 @@
test_array [0] = 0
;
-@@ -25556,10 +26180,11 @@
+@@ -25526,24 +27444,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25556,10 +27486,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24498,7 +28792,52 @@
test_array [0] = 0
;
-@@ -25593,30 +26218,32 @@
+@@ -25567,24 +27498,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25593,30 +27536,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24515,8 +28854,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24539,7 +28879,52 @@
test_array [0] = 0
;
-@@ -25654,10 +26281,11 @@
+@@ -25624,24 +27569,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25654,10 +27611,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24552,7 +28937,52 @@
test_array [0] = 0
;
-@@ -25691,23 +26319,26 @@
+@@ -25665,24 +27623,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25691,24 +27661,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24569,8 +28999,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24579,14 +29010,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25719,10 +26350,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25719,10 +27692,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24599,15 +29033,61 @@
test_array [0] = 0
;
-@@ -25756,26 +26388,20 @@
+@@ -25730,24 +27704,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25756,26 +27742,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -24631,7 +29111,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25783,8 +26409,9 @@
+@@ -25783,8 +27763,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24643,7 +29123,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25793,22 +26420,22 @@
+@@ -25793,35 +27774,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24675,7 +29155,33 @@
;
return 0;
-@@ -25832,28 +26459,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25832,28 +27822,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24712,7 +29218,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25864,12 +26490,13 @@
+@@ -25864,36 +27853,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24728,15 +29234,60 @@
return 0;
;
return 0;
-@@ -25902,20 +26529,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25902,20 +27904,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -24756,7 +29307,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25928,10 +26556,11 @@
+@@ -25928,10 +27931,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24769,7 +29320,52 @@
test_array [0] = 0
;
-@@ -25969,10 +26598,11 @@
+@@ -25939,24 +27943,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25969,10 +27985,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24782,7 +29378,52 @@
test_array [0] = 0
;
-@@ -26006,30 +26636,32 @@
+@@ -25980,24 +27997,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26006,30 +28035,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24799,8 +29440,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24823,7 +29465,52 @@
test_array [0] = 0
;
-@@ -26067,10 +26699,11 @@
+@@ -26037,24 +28068,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26067,10 +28110,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24836,7 +29523,52 @@
test_array [0] = 0
;
-@@ -26104,23 +26737,26 @@
+@@ -26078,24 +28122,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26104,24 +28160,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24853,8 +29585,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -24863,14 +29596,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26132,10 +26768,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26132,10 +28191,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24883,15 +29619,61 @@
test_array [0] = 0
;
-@@ -26169,26 +26806,20 @@
+@@ -26143,24 +28203,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26169,26 +28241,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -24915,7 +29697,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26196,8 +26827,9 @@
+@@ -26196,8 +28262,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24927,7 +29709,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26206,22 +26838,22 @@
+@@ -26206,35 +28273,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24959,7 +29741,33 @@
;
return 0;
-@@ -26245,28 +26877,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26245,28 +28321,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24996,7 +29804,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26277,12 +26908,13 @@
+@@ -26277,36 +28352,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25012,15 +29820,60 @@
return 0;
;
return 0;
-@@ -26315,20 +26947,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26315,20 +28403,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_char_p=no
+ ac_cv_type_char_p=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -25040,7 +29893,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26341,10 +26974,11 @@
+@@ -26341,10 +28430,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25053,7 +29906,52 @@
test_array [0] = 0
;
-@@ -26382,10 +27016,11 @@
+@@ -26352,24 +28442,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26382,10 +28484,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25066,7 +29964,52 @@
test_array [0] = 0
;
-@@ -26419,30 +27054,32 @@
+@@ -26393,24 +28496,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26419,30 +28534,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25083,8 +30026,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25107,7 +30051,52 @@
test_array [0] = 0
;
-@@ -26480,10 +27117,11 @@
+@@ -26450,24 +28567,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26480,10 +28609,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25120,7 +30109,52 @@
test_array [0] = 0
;
-@@ -26517,23 +27155,26 @@
+@@ -26491,24 +28621,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26517,24 +28659,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25137,8 +30171,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25147,14 +30182,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26545,10 +27186,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26545,10 +28690,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25167,15 +30205,61 @@
test_array [0] = 0
;
-@@ -26582,26 +27224,20 @@
+@@ -26556,24 +28702,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26582,26 +28740,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -25199,7 +30283,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26609,8 +27245,9 @@
+@@ -26609,8 +28761,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25211,7 +30295,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26619,22 +27256,22 @@
+@@ -26619,35 +28772,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25243,7 +30327,33 @@
;
return 0;
-@@ -26658,30 +27295,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26658,30 +28820,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25282,7 +30392,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26694,17 +27330,17 @@
+@@ -26694,40 +28855,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25304,15 +30414,59 @@
;
return 0;
}
-@@ -26736,14 +27372,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26736,14 +28909,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25323,7 +30477,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26752,8 +27389,8 @@
+@@ -26752,8 +28926,8 @@
fi
@@ -25334,7 +30488,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26766,17 +27403,17 @@
+@@ -26766,40 +28940,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25356,15 +30510,59 @@
;
return 0;
}
-@@ -26808,14 +27445,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26808,14 +28994,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_unload=no
+ ac_cv_lib_dld_shl_unload=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25375,7 +30573,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26829,8 +27467,8 @@
+@@ -26829,8 +29016,8 @@
@@ -25386,7 +30584,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26841,12 +27479,13 @@
+@@ -26841,36 +29028,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25402,15 +30600,60 @@
return 0;
;
return 0;
-@@ -26879,20 +27518,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26879,20 +29079,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ ac_cv_type_size_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -25430,7 +30673,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26905,10 +27545,11 @@
+@@ -26905,10 +29106,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25443,7 +30686,52 @@
test_array [0] = 0
;
-@@ -26946,10 +27587,11 @@
+@@ -26916,24 +29118,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26946,10 +29160,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25456,7 +30744,52 @@
test_array [0] = 0
;
-@@ -26983,30 +27625,32 @@
+@@ -26957,24 +29172,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26983,30 +29210,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25473,8 +30806,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25497,7 +30831,52 @@
test_array [0] = 0
;
-@@ -27044,10 +27688,11 @@
+@@ -27014,24 +29243,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27044,10 +29285,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25510,7 +30889,52 @@
test_array [0] = 0
;
-@@ -27081,23 +27726,26 @@
+@@ -27055,24 +29297,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27081,24 +29335,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25527,8 +30951,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25537,14 +30962,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27109,10 +27757,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27109,10 +29366,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25557,15 +30985,61 @@
test_array [0] = 0
;
-@@ -27146,26 +27795,20 @@
+@@ -27120,24 +29378,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27146,26 +29416,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -25589,7 +31063,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27173,8 +27816,9 @@
+@@ -27173,8 +29437,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25601,7 +31075,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27183,22 +27827,22 @@
+@@ -27183,35 +29448,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25633,7 +31107,33 @@
;
return 0;
-@@ -27222,29 +27866,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27222,29 +29496,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25671,7 +31171,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27255,12 +27898,13 @@
+@@ -27255,36 +29528,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25687,15 +31187,60 @@
return 0;
;
return 0;
-@@ -27293,20 +27937,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27293,20 +29579,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
+ ac_cv_type_unsigned_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
@@ -25715,7 +31260,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -27319,10 +27964,11 @@
+@@ -27319,10 +29606,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25728,7 +31273,52 @@
test_array [0] = 0
;
-@@ -27360,10 +28006,11 @@
+@@ -27330,24 +29618,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27360,10 +29660,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25741,7 +31331,52 @@
test_array [0] = 0
;
-@@ -27397,30 +28044,32 @@
+@@ -27371,24 +29672,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27397,30 +29710,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25758,8 +31393,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25782,7 +31418,52 @@
test_array [0] = 0
;
-@@ -27458,10 +28107,11 @@
+@@ -27428,24 +29743,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27458,10 +29785,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25795,7 +31476,52 @@
test_array [0] = 0
;
-@@ -27495,23 +28145,26 @@
+@@ -27469,24 +29797,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27495,24 +29835,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25812,8 +31538,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -25822,14 +31549,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27523,10 +28176,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27523,10 +29866,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25842,15 +31572,61 @@
test_array [0] = 0
;
-@@ -27560,26 +28214,20 @@
+@@ -27534,24 +29878,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27560,26 +29916,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
@@ -25874,7 +31650,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27587,8 +28235,9 @@
+@@ -27587,8 +29937,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25886,7 +31662,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27597,22 +28246,22 @@
+@@ -27597,35 +29948,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25918,7 +31694,33 @@
;
return 0;
-@@ -27636,30 +28285,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27636,30 +29996,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25957,9 +31759,50 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27701,15 +28349,15 @@
+@@ -27680,36 +30039,48 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
@@ -25977,12 +31820,13 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27721,18 +28369,18 @@
+@@ -27721,18 +30092,18 @@
{ (exit 1); exit 1; }; }
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for PIE support" >&5
@@ -26000,18 +31844,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27788,8 +28436,9 @@
+@@ -27762,24 +30133,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27788,9 +30171,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_pie_support=no
+ kde_cv_val_pie_support=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -27803,26 +28452,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27803,26 +30187,26 @@
fi
@@ -26048,7 +31939,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27841,18 +28490,19 @@
+@@ -27841,18 +30225,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26076,17 +31967,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27889,15 +28539,16 @@
+@@ -27863,24 +30248,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27889,15 +30286,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -26098,7 +32035,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27931,9 +28582,10 @@
+@@ -27906,8 +30304,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -27931,9 +30334,10 @@
ac_header_preproc=no
fi
@@ -26111,7 +32064,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27957,25 +28609,19 @@
+@@ -27957,25 +30361,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;}
@@ -26144,7 +32097,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27987,8 +28633,8 @@
+@@ -27987,8 +30385,8 @@
done
@@ -26155,7 +32108,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28015,30 +28661,24 @@
+@@ -28015,53 +30413,59 @@
#undef _NSGetEnviron
@@ -26191,15 +32144,59 @@
;
return 0;
}
-@@ -28070,13 +28710,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28070,13 +30474,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__NSGetEnviron=no
+ ac_cv_func__NSGetEnviron=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -26209,7 +32206,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28097,9 +28738,9 @@
+@@ -28097,9 +30502,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26222,7 +32219,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28125,30 +28766,24 @@
+@@ -28125,53 +30530,59 @@
#undef $ac_func
@@ -26258,15 +32255,59 @@
;
return 0;
}
-@@ -28180,13 +28815,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28180,13 +30591,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -26277,7 +32318,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28203,32 +28840,32 @@
+@@ -28203,32 +30616,32 @@
@@ -26322,7 +32363,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28244,8 +28881,8 @@
+@@ -28244,8 +30657,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -26333,7 +32374,23 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28350,6 +28987,7 @@
+@@ -28282,8 +30695,13 @@
+ /* end confdefs.h. */
+ #include <$x_direct_test_include>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -28350,6 +30768,7 @@
fi
done
fi
@@ -26341,7 +32398,52 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28407,7 +29045,7 @@
+@@ -28379,24 +30798,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28407,7 +30838,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26350,15 +32452,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28455,6 +29093,7 @@
+@@ -28455,7 +30886,8 @@
done
done
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28465,7 +29104,7 @@
+
+@@ -28465,21 +30897,26 @@
*-*-solaris*)
;;
*)
@@ -26366,15 +32470,24 @@
+ rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-@@ -28473,13 +29112,13 @@
- acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+ cat >Imakefile <<'_ACEOF'
+-acfindx:
+- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++incroot:
++ @echo incroot='${INCROOT}'
++usrlibdir:
++ @echo usrlibdir='${USRLIBDIR}'
++libdir:
++ @echo libdir='${LIBDIR}'
_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++ for ac_var in incroot usrlibdir libdir; do
++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
++ done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
@@ -26384,7 +32497,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28487,7 +29126,7 @@
+@@ -28487,7 +30924,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
@@ -26393,7 +32506,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28496,7 +29135,7 @@
+@@ -28496,7 +30933,7 @@
esac
fi
cd ..
@@ -26402,7 +32515,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28540,12 +29179,12 @@
+@@ -28540,12 +30977,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -26419,7 +32532,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28573,8 +29212,8 @@
+@@ -28573,8 +31010,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.
@@ -26430,7 +32543,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28587,17 +29226,17 @@
+@@ -28587,40 +31024,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26452,15 +32565,59 @@
;
return 0;
}
-@@ -28629,14 +29268,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28629,14 +31078,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26471,7 +32628,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28645,8 +29285,8 @@
+@@ -28645,8 +31095,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -26482,7 +32639,52 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28706,9 +29346,10 @@
+@@ -28680,24 +31130,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28706,10 +31168,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26490,11 +32692,13 @@
+ kde_cv_have_libXext=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -28718,8 +29359,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28718,8 +31181,8 @@
fi
@@ -26505,7 +32709,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28865,8 +29506,8 @@
+@@ -28865,8 +31328,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -26516,7 +32720,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28877,9 +29518,9 @@
+@@ -28877,9 +31340,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -26529,7 +32733,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28891,17 +29532,17 @@
+@@ -28891,40 +31354,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26551,15 +32755,59 @@
;
return 0;
}
-@@ -28933,14 +29574,16 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28933,14 +31408,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ eval "$as_ac_Lib=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26571,7 +32819,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28953,8 +29596,8 @@
+@@ -28953,8 +31430,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -26582,7 +32830,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28967,17 +29610,17 @@
+@@ -28967,40 +31444,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26604,15 +32852,59 @@
;
return 0;
}
-@@ -29009,14 +29652,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29009,14 +31498,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26623,7 +32915,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29024,8 +29668,8 @@
+@@ -29024,8 +31514,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -26634,8 +32926,50 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29066,17 +29710,18 @@
+@@ -29044,40 +31534,53 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -26653,11 +32987,13 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29092,16 +29737,15 @@
+ fi
+@@ -29092,16 +31595,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -26678,17 +33014,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29154,7 +29798,9 @@
+@@ -29128,24 +31630,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29154,8 +31668,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29168,13 +29814,13 @@
+ ac_ext=c
+@@ -29168,13 +31684,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -26706,7 +33089,7 @@
:
fi
-@@ -29186,16 +29832,15 @@
+@@ -29186,16 +31702,15 @@
case $host_os in
solaris*)
@@ -26727,17 +33110,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29248,7 +29893,9 @@
+@@ -29222,24 +31737,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29248,8 +31775,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29262,13 +29909,13 @@
+ ac_ext=c
+@@ -29262,13 +31791,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -26755,7 +33185,7 @@
:
fi
-@@ -29295,17 +29942,17 @@
+@@ -29295,17 +31824,17 @@
@@ -26779,7 +33209,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29323,21 +29970,21 @@
+@@ -29323,21 +31852,21 @@
fi
@@ -26809,7 +33239,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29356,14 +30003,14 @@
+@@ -29356,14 +31885,14 @@
@@ -26828,18 +33258,65 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29423,8 +30070,9 @@
+@@ -29397,24 +31926,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29423,9 +31964,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_z=no"
+ eval "ac_cv_lib_z=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29438,8 +30086,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29438,8 +31980,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -26850,7 +33327,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29459,8 +30107,8 @@
+@@ -29459,8 +32001,8 @@
@@ -26861,7 +33338,52 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29522,9 +30170,10 @@
+@@ -29496,24 +32038,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29522,10 +32076,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26869,11 +33391,13 @@
+ eval "ac_cv_lib_png=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29539,19 +30188,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29539,19 +32094,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -26899,18 +33423,65 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29610,8 +30259,9 @@
+@@ -29584,24 +32139,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29610,9 +32177,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_6b=no"
+ eval "ac_cv_lib_jpeg_6b=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29622,14 +30272,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29622,14 +32190,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -26931,18 +33502,65 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29688,8 +30338,9 @@
+@@ -29662,24 +32230,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29688,9 +32268,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_normal=no"
+ eval "ac_cv_lib_jpeg_normal=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29700,11 +30351,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29700,11 +32281,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -26958,16 +33576,16 @@
LIBJPEG=
-@@ -29724,7 +30375,7 @@
+@@ -29724,7 +32305,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29727: $i/$j" >&5
-+ echo "configure: 30378: $i/$j" >&5
++ echo "configure: 32308: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29771,14 +30422,14 @@
+@@ -29771,14 +32352,14 @@
@@ -26985,7 +33603,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29821,8 +30472,8 @@
+@@ -29821,8 +32402,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -26996,7 +33614,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29831,8 +30482,8 @@
+@@ -29831,8 +32412,8 @@
{ (exit 1); exit 1; }; }
else
@@ -27007,7 +33625,7 @@
PERL=$kde_cv_path
fi
-@@ -29846,10 +30497,9 @@
+@@ -29846,10 +32427,9 @@
@@ -27020,7 +33638,7 @@
else
if test $kde_qtver = 3; then
-@@ -29859,7 +30509,8 @@
+@@ -29859,7 +32439,8 @@
fi
@@ -27030,7 +33648,7 @@
USING_QT_MT=""
-@@ -29879,13 +30530,13 @@
+@@ -29879,13 +32460,13 @@
else
kde_check_threading_default=yes
fi
@@ -27048,7 +33666,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29957,8 +30608,8 @@
+@@ -29957,8 +32538,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -27059,7 +33677,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29967,34 +30618,34 @@
+@@ -29967,34 +32548,34 @@
qt_libraries=""
qt_includes=""
@@ -27074,14 +33692,14 @@
-fi;
+fi
++
-# Check whether --with-qt-includes or --without-qt-includes was given.
--if test "${with_qt_includes+set}" = set; then
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
- withval="$with_qt_includes"
-
-+# Check whether --with-qt-includes was given.
-+if test "${with_qt_includes+set}" = set; then
+-
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -27106,16 +33724,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30022,7 +30673,7 @@
+@@ -30022,7 +32603,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30025: $i/$j" >&5
-+ echo "configure: 30676: $i/$j" >&5
++ echo "configure: 32606: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30059,8 +30710,7 @@
+@@ -30059,8 +32640,7 @@
ac_qt_libraries="$qt_libdir"
@@ -27125,7 +33743,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30197,13 +30847,13 @@
+@@ -30197,13 +32777,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -27143,7 +33761,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30212,15 +30862,14 @@
+@@ -30212,15 +32792,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -27162,7 +33780,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30341,12 +30990,12 @@
+@@ -30341,12 +32920,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -27179,7 +33797,7 @@
fi
-@@ -30384,14 +31033,14 @@
+@@ -30384,14 +32963,14 @@
fi
@@ -27197,7 +33815,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30434,8 +31083,8 @@
+@@ -30434,8 +33013,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27208,7 +33826,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30456,22 +31105,22 @@
+@@ -30456,22 +33035,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27236,7 +33854,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30514,12 +31163,12 @@
+@@ -30514,12 +33093,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27253,7 +33871,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30549,10 +31198,10 @@
+@@ -30549,10 +33128,10 @@
if test $kde_qtver = 3; then
@@ -27267,7 +33885,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30575,22 +31224,22 @@
+@@ -30575,22 +33154,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27297,7 +33915,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30613,13 +31262,13 @@
+@@ -30613,13 +33192,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27315,7 +33933,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30650,15 +31299,14 @@
+@@ -30650,15 +33229,14 @@
if test -n "$LIBJPEG"; then
@@ -27334,18 +33952,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30717,8 +31365,9 @@
+@@ -30691,24 +33269,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -30717,9 +33307,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "kde_cv_qt_jpeg=yes"
+ eval "kde_cv_qt_jpeg=yes"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -30735,12 +31384,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30735,12 +33326,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -27362,7 +34027,7 @@
LIBJPEG_QT=
fi
-@@ -30771,15 +31420,15 @@
+@@ -30771,15 +33362,15 @@
@@ -27384,7 +34049,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30803,11 +31452,11 @@
+@@ -30803,11 +33394,11 @@
@@ -27400,34 +34065,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30859,7 +31508,7 @@
+@@ -30859,7 +33450,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30862: $i/$j" >&5
-+ echo "configure: 31511: $i/$j" >&5
++ echo "configure: 33453: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30889,7 +31538,7 @@
+@@ -30889,7 +33480,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30892: $i/$j" >&5
-+ echo "configure: 31541: $i/$j" >&5
++ echo "configure: 33483: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30907,7 +31556,7 @@
+@@ -30907,7 +33498,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30910: $i/$j" >&5
-+ echo "configure: 31559: $i/$j" >&5
++ echo "configure: 33501: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30966,12 +31615,12 @@
+@@ -30966,12 +33557,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -27444,7 +34109,7 @@
fi
kde_libraries="${libdir}"
-@@ -30980,8 +31629,8 @@
+@@ -30980,8 +33571,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -27455,7 +34120,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31019,8 +31668,8 @@
+@@ -31019,8 +33610,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -27466,7 +34131,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31063,8 +31712,8 @@
+@@ -31063,8 +33654,8 @@
fi
@@ -27477,7 +34142,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31096,10 +31745,9 @@
+@@ -31096,10 +33687,9 @@
@@ -27490,7 +34155,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31113,13 +31761,14 @@
+@@ -31113,13 +33703,14 @@
fi
@@ -27508,28 +34173,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31230,15 +31879,14 @@
+@@ -31230,15 +33821,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31290,8 +31938,8 @@
+@@ -31290,8 +33880,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -27540,7 +34205,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31330,8 +31978,8 @@
+@@ -31330,8 +33920,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -27551,7 +34216,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31339,8 +31987,8 @@
+@@ -31339,8 +33929,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -27562,28 +34227,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31533,15 +32181,14 @@
+@@ -31533,15 +34123,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31593,8 +32240,8 @@
+@@ -31593,8 +34182,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -27594,7 +34259,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31633,8 +32280,8 @@
+@@ -31633,8 +34222,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -27605,7 +34270,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31642,8 +32289,8 @@
+@@ -31642,8 +34231,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -27616,7 +34281,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31735,22 +32382,22 @@
+@@ -31735,22 +34324,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -27645,7 +34310,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31783,14 +32430,14 @@
+@@ -31783,14 +34372,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -27663,7 +34328,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31833,8 +32480,8 @@
+@@ -31833,8 +34422,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27674,7 +34339,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31845,21 +32492,21 @@
+@@ -31845,21 +34434,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27701,7 +34366,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31902,8 +32549,8 @@
+@@ -31902,8 +34491,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27712,7 +34377,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31914,22 +32561,22 @@
+@@ -31914,22 +34503,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27740,7 +34405,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31972,8 +32619,8 @@
+@@ -31972,8 +34561,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27751,7 +34416,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31986,21 +32633,21 @@
+@@ -31986,21 +34575,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27778,7 +34443,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32043,8 +32690,8 @@
+@@ -32043,8 +34632,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27789,7 +34454,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32057,22 +32704,22 @@
+@@ -32057,22 +34646,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27817,7 +34482,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32115,12 +32762,12 @@
+@@ -32115,12 +34704,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27834,7 +34499,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32149,14 +32796,14 @@
+@@ -32149,14 +34738,14 @@
if test -n "$kde32ornewer"; then
@@ -27852,7 +34517,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32199,8 +32846,8 @@
+@@ -32199,8 +34788,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27863,7 +34528,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32211,21 +32858,21 @@
+@@ -32211,21 +34800,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27890,7 +34555,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32268,8 +32915,8 @@
+@@ -32268,8 +34857,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27901,7 +34566,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32280,8 +32927,8 @@
+@@ -32280,8 +34869,8 @@
{ (exit 1); exit 1; }; }
else
@@ -27912,7 +34577,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32289,14 +32936,14 @@
+@@ -32289,14 +34878,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -27930,7 +34595,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32339,8 +32986,8 @@
+@@ -32339,8 +34928,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27941,7 +34606,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32351,8 +32998,8 @@
+@@ -32351,8 +34940,8 @@
{ (exit 1); exit 1; }; }
else
@@ -27952,7 +34617,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32360,14 +33007,14 @@
+@@ -32360,14 +34949,14 @@
fi
@@ -27970,7 +34635,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32410,12 +33057,12 @@
+@@ -32410,12 +34999,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27987,16 +34652,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32430,7 +33077,7 @@
+@@ -32430,7 +35019,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32433: $i/$j" >&5
-+ echo "configure: 33080: $i/$j" >&5
++ echo "configure: 35022: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32591,13 +33238,12 @@
+@@ -32591,13 +35180,12 @@
@@ -28013,7 +34678,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32618,13 +33264,13 @@
+@@ -32618,13 +35206,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -28031,7 +34696,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32644,16 +33290,15 @@
+@@ -32644,16 +35232,15 @@
kde_have_gcc_visibility=no
@@ -28052,17 +34717,64 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32706,7 +33351,9 @@
+@@ -32680,24 +35267,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -32706,8 +35305,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -32720,28 +33367,27 @@
+ ac_ext=c
+@@ -32720,28 +35321,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -28083,10 +34795,10 @@
kde_have_gcc_visibility=no
-fi;
+fi
-+
- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
@@ -28100,18 +34812,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32802,8 +33448,9 @@
+@@ -32776,24 +35376,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -32802,9 +35414,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_qt_gcc_visibility_patched=yes
+ kde_cv_val_qt_gcc_visibility_patched=yes
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32816,21 +33463,20 @@
+ ac_ext=c
+@@ -32816,21 +35429,20 @@
fi
@@ -28138,18 +34897,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32896,8 +33542,9 @@
+@@ -32870,24 +35482,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -32896,9 +35520,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_gcc_visibility_bug=yes
+ kde_cv_val_gcc_visibility_bug=yes
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -32912,8 +33559,8 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -32912,8 +35537,8 @@
fi
@@ -28160,7 +34966,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32929,8 +33576,8 @@
+@@ -32929,8 +35554,8 @@
fi
else
@@ -28171,7 +34977,7 @@
:
fi
-@@ -32938,8 +33585,8 @@
+@@ -32938,8 +35563,8 @@
fi
@@ -28182,16 +34988,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -32951,7 +33598,7 @@
+@@ -32951,7 +35576,7 @@
do
for j in qsql.html;
do
- echo "configure: 32954: $i/$j" >&5
-+ echo "configure: 33601: $i/$j" >&5
++ echo "configure: 35579: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32960,20 +33607,20 @@
+@@ -32960,20 +35585,20 @@
done
done
@@ -28217,7 +35023,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33016,12 +33663,12 @@
+@@ -33016,12 +35641,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28234,7 +35040,7 @@
DOT=$kde_cv_path
fi
-@@ -33033,14 +33680,14 @@
+@@ -33033,14 +35658,14 @@
fi
@@ -28252,7 +35058,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33083,12 +33730,12 @@
+@@ -33083,12 +35708,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28269,7 +35075,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -33114,18 +33761,19 @@
+@@ -33114,18 +35739,19 @@
for ac_header in linux/tcp.h linux/if_ppp.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28297,17 +35103,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33162,15 +33810,16 @@
+@@ -33136,24 +35762,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33162,15 +35800,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28319,7 +35171,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33204,9 +33853,10 @@
+@@ -33179,8 +35818,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33204,9 +35848,10 @@
ac_header_preproc=no
fi
@@ -28332,7 +35200,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33230,25 +33880,19 @@
+@@ -33230,25 +35875,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;}
@@ -28365,7 +35233,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33265,18 +33909,19 @@
+@@ -33265,18 +35904,19 @@
for ac_header in net/errno.h net/if_ppp.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28393,17 +35261,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33313,15 +33958,16 @@
+@@ -33287,24 +35927,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33313,15 +35965,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28415,7 +35329,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33355,9 +34001,10 @@
+@@ -33330,8 +35983,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33355,9 +36013,10 @@
ac_header_preproc=no
fi
@@ -28428,7 +35358,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33381,25 +34028,19 @@
+@@ -33381,25 +36040,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;}
@@ -28461,7 +35391,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33415,18 +34056,19 @@
+@@ -33415,18 +36068,19 @@
for ac_header in asm/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28489,17 +35419,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33463,15 +34105,16 @@
+@@ -33437,24 +36091,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33463,15 +36129,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28511,7 +35487,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33505,9 +34148,10 @@
+@@ -33480,8 +36147,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33505,9 +36177,10 @@
ac_header_preproc=no
fi
@@ -28524,7 +35516,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33531,25 +34175,19 @@
+@@ -33531,25 +36204,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;}
@@ -28557,7 +35549,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33569,18 +34207,19 @@
+@@ -33569,18 +36236,19 @@
for ac_header in sys/file.h sys/stat.h sys/time.h sys/cdefs.h sys/sockio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28585,17 +35577,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33617,15 +34256,16 @@
+@@ -33591,24 +36259,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33617,15 +36297,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28607,7 +35645,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33659,9 +34299,10 @@
+@@ -33634,8 +36315,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33659,9 +36345,10 @@
ac_header_preproc=no
fi
@@ -28620,7 +35674,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33685,25 +34326,19 @@
+@@ -33685,25 +36372,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;}
@@ -28653,7 +35707,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33724,18 +34359,19 @@
+@@ -33724,18 +36405,19 @@
for ac_header in fcntl.h unistd.h fnmatch.h sysent.h strings.h paths.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28681,17 +35735,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33772,15 +34408,16 @@
+@@ -33746,24 +36428,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33772,15 +36466,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28703,7 +35803,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33814,9 +34451,10 @@
+@@ -33789,8 +36484,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33814,9 +36514,10 @@
ac_header_preproc=no
fi
@@ -28716,7 +35832,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33840,25 +34478,19 @@
+@@ -33840,25 +36541,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;}
@@ -28749,7 +35865,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33877,18 +34509,19 @@
+@@ -33877,18 +36572,19 @@
for ac_header in utmp.h re_comp.h getopt.h byteswap.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28777,17 +35893,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33925,15 +34558,16 @@
+@@ -33899,24 +36595,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -33925,15 +36633,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28799,7 +35961,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33967,9 +34601,10 @@
+@@ -33942,8 +36651,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -33967,9 +36681,10 @@
ac_header_preproc=no
fi
@@ -28812,7 +35990,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33993,25 +34628,19 @@
+@@ -33993,25 +36708,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;}
@@ -28845,7 +36023,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34023,8 +34652,8 @@
+@@ -34023,8 +36732,8 @@
done
@@ -28856,15 +36034,61 @@
if test "${ac_cv_header_resolv_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34065,25 +34694,26 @@
+@@ -34039,24 +36748,36 @@
+ #include <resolv.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34065,25 +36786,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_resolv_h=no
+ ac_cv_header_resolv_h=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
-echo "${ECHO_T}$ac_cv_header_resolv_h" >&6
@@ -28891,7 +36115,7 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34091,8 +34721,8 @@
+@@ -34091,8 +36813,8 @@
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@@ -28902,41 +36126,119 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34116,7 +34746,7 @@
+@@ -34116,25 +36838,37 @@
return 0;
}
_ACEOF
- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+ rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
-@@ -34143,10 +34773,12 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34143,28 +36877,42 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext
+-rm -f conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++
++rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
-@@ -34173,7 +34805,9 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34173,22 +36921,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext
+
- rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -34181,14 +34815,14 @@
+ CC=$ac_save_CC
rm -f conftest.$ac_ext
fi
fi
@@ -28955,24 +36257,117 @@
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34244,7 +34878,9 @@
+@@ -34218,24 +36968,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34244,8 +37006,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34297,13 +34933,15 @@
+ _ACEOF
+@@ -34271,24 +37035,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34297,13 +37073,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
break
done
fi
@@ -28983,7 +36378,7 @@
if test "$ac_cv_sys_file_offset_bits" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -34312,8 +34950,8 @@
+@@ -34312,8 +37090,8 @@
fi
rm -f conftest*
@@ -28994,24 +36389,117 @@
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34369,7 +35007,9 @@
+@@ -34343,24 +37121,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34369,8 +37159,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34422,13 +35062,15 @@
+ _ACEOF
+@@ -34396,24 +37188,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34422,13 +37226,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
break
done
fi
@@ -29022,7 +36510,7 @@
if test "$ac_cv_sys_large_files" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -34451,9 +35093,9 @@
+@@ -34451,9 +37257,9 @@
for ac_func in flock
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29035,7 +36523,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34479,30 +35121,24 @@
+@@ -34479,53 +37285,59 @@
#undef $ac_func
@@ -29071,15 +36559,59 @@
;
return 0;
}
-@@ -34534,13 +35170,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34534,13 +37346,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -29090,7 +36622,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34551,15 +35189,14 @@
+@@ -34551,15 +37365,14 @@
@@ -29109,7 +36641,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34571,9 +35208,6 @@
+@@ -34571,9 +37384,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29119,18 +36651,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34624,8 +35258,9 @@
+@@ -34598,24 +37408,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34624,9 +37446,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_usleep=no
+ kde_cv_func_usleep=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -34639,11 +35274,11 @@
+ ac_ext=c
+@@ -34639,11 +37462,11 @@
fi
@@ -29146,7 +36725,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34664,8 +35299,7 @@
+@@ -34664,8 +37487,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -29156,7 +36735,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34729,9 +35363,10 @@
+@@ -34702,24 +37524,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34729,10 +37563,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29164,11 +36788,13 @@
+ kde_cv_proto_usleep="usleep unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -34745,8 +35380,8 @@
+ ac_ext=c
+@@ -34745,8 +37580,8 @@
fi
@@ -29179,7 +36805,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -34777,9 +35412,9 @@
+@@ -34777,9 +37612,9 @@
for ac_func in socket fabsl strdup vsnprintf tzset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29192,7 +36818,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34805,30 +35440,24 @@
+@@ -34805,53 +37640,59 @@
#undef $ac_func
@@ -29228,15 +36854,59 @@
;
return 0;
}
-@@ -34860,13 +35489,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34860,13 +37701,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -29247,7 +36917,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34877,15 +35508,14 @@
+@@ -34877,15 +37720,14 @@
@@ -29266,7 +36936,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34897,9 +35527,6 @@
+@@ -34897,9 +37739,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29276,18 +36946,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34948,8 +35575,9 @@
+@@ -34922,24 +37761,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -34948,9 +37799,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_setenv=no
+ kde_cv_func_setenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -34963,11 +35591,11 @@
+ ac_ext=c
+@@ -34963,11 +37815,11 @@
fi
@@ -29303,7 +37020,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34988,8 +35616,7 @@
+@@ -34988,8 +37840,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -29313,7 +37030,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35051,9 +35678,10 @@
+@@ -35024,24 +37875,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35051,10 +37914,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29321,11 +37083,13 @@
+ kde_cv_proto_setenv="setenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -35067,8 +35695,8 @@
+ ac_ext=c
+@@ -35067,8 +37931,8 @@
fi
@@ -29336,7 +37100,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -35092,15 +35720,14 @@
+@@ -35092,15 +37956,14 @@
@@ -29355,7 +37119,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35112,9 +35739,6 @@
+@@ -35112,9 +37975,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29365,18 +37129,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35163,8 +35787,9 @@
+@@ -35137,24 +37997,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35163,9 +38035,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_unsetenv=no
+ kde_cv_func_unsetenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -35178,11 +35803,11 @@
+ ac_ext=c
+@@ -35178,11 +38051,11 @@
fi
@@ -29392,7 +37203,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35203,8 +35828,7 @@
+@@ -35203,8 +38076,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -29402,7 +37213,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35266,9 +35890,10 @@
+@@ -35239,24 +38111,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35266,10 +38150,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29410,11 +37266,13 @@
+ kde_cv_proto_unsetenv="unsetenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -35282,8 +35907,8 @@
+ ac_ext=c
+@@ -35282,8 +38167,8 @@
fi
@@ -29425,7 +37283,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -35307,15 +35932,14 @@
+@@ -35307,15 +38192,14 @@
@@ -29444,7 +37302,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35327,9 +35951,6 @@
+@@ -35327,9 +38211,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29454,18 +37312,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35383,8 +36004,9 @@
+@@ -35357,24 +38238,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35383,9 +38276,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_getdomainname=no
+ kde_cv_func_getdomainname=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -35398,11 +36020,11 @@
+ ac_ext=c
+@@ -35398,11 +38292,11 @@
fi
@@ -29481,7 +37386,7 @@
if test "${kde_cv_proto_getdomainname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35423,8 +36045,7 @@
+@@ -35423,8 +38317,7 @@
if test "x$kde_cv_proto_getdomainname" = xunknown; then
@@ -29491,7 +37396,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35492,9 +36113,10 @@
+@@ -35465,24 +38358,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35492,10 +38397,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29499,11 +37449,13 @@
+ kde_cv_proto_getdomainname="getdomainname unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -35508,8 +36130,8 @@
+ ac_ext=c
+@@ -35508,8 +38414,8 @@
fi
@@ -29514,7 +37466,7 @@
if test "x$kde_cv_func_getdomainname" = xyes; then
-@@ -35533,15 +36155,14 @@
+@@ -35533,15 +38439,14 @@
@@ -29533,7 +37485,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35553,9 +36174,6 @@
+@@ -35553,9 +38458,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29543,18 +37495,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35608,8 +36226,9 @@
+@@ -35582,24 +38484,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35608,9 +38522,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_gethostname=no
+ kde_cv_func_gethostname=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -35623,11 +36242,11 @@
+ ac_ext=c
+@@ -35623,11 +38538,11 @@
fi
@@ -29570,7 +37569,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35648,8 +36267,7 @@
+@@ -35648,8 +38563,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -29580,7 +37579,52 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35715,9 +36333,10 @@
+@@ -35688,24 +38602,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35715,10 +38641,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29588,11 +37632,13 @@
+ kde_cv_proto_gethostname="gethostname unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -35731,8 +36350,8 @@
+ ac_ext=c
+@@ -35731,8 +38658,8 @@
fi
@@ -29603,7 +37649,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -35754,8 +36373,8 @@
+@@ -35754,8 +38681,8 @@
@@ -29614,15 +37660,106 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35850,14 +36469,15 @@
+@@ -35781,24 +38708,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35824,24 +38763,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35850,14 +38801,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29632,7 +37769,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -35867,11 +36487,11 @@
+@@ -35867,11 +38819,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29648,17 +37785,64 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -35918,7 +36538,9 @@
+@@ -35882,24 +38834,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35918,8 +38882,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35927,17 +36549,22 @@
+ /* confdefs.h. */
+@@ -35927,27 +38893,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29684,7 +37868,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -35960,13 +36587,16 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35960,13 +38940,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -29694,8 +37901,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -29704,7 +37912,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -35985,8 +36615,8 @@
+@@ -35985,8 +38968,8 @@
esac
@@ -29715,7 +37923,7 @@
if test "${ac_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36013,30 +36643,24 @@
+@@ -36013,53 +38996,59 @@
#undef res_init
@@ -29734,13 +37942,14 @@
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_res_init) || defined (__stub___res_init)
-+#if defined __stub_res_init || defined __stub___res_init
- choke me
+-choke me
-#else
-char (*f) () = res_init;
-#endif
-#ifdef __cplusplus
-}
++#if defined __stub_res_init || defined __stub___res_init
++choke me
#endif
int
@@ -29751,15 +37960,59 @@
;
return 0;
}
-@@ -36068,17 +36692,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36068,17 +39057,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_res_init=no
+ ac_cv_func_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
@@ -29775,7 +38028,7 @@
if test "${ac_cv_lib_resolv_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36091,17 +36716,17 @@
+@@ -36091,40 +39081,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29797,15 +38050,59 @@
;
return 0;
}
-@@ -36133,14 +36758,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36133,14 +39135,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_resolv_res_init=no
+ ac_cv_lib_resolv_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29816,7 +38113,7 @@
if test $ac_cv_lib_resolv_res_init = yes; then
LIBRESOLV="-lresolv $LIBSOCKET"
fi
-@@ -36148,8 +36774,8 @@
+@@ -36148,8 +39151,8 @@
fi
@@ -29827,15 +38124,61 @@
if test "${ac_cv_var_timezone+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36199,12 +36825,13 @@
+@@ -36173,24 +39176,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36199,12 +39214,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_var_timezone=no
+ ac_cv_var_timezone=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_var_timezone" >&5
-echo "${ECHO_T}$ac_cv_var_timezone" >&6
@@ -29844,7 +38187,7 @@
if test $ac_cv_var_timezone = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36212,8 +36839,8 @@
+@@ -36212,8 +39228,8 @@
_ACEOF
fi
@@ -29855,15 +38198,61 @@
if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36264,12 +36891,13 @@
+@@ -36238,24 +39254,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36264,12 +39292,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_struct_tm_gmtoff=no
+ ac_cv_struct_tm_gmtoff=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6
@@ -29872,7 +38261,7 @@
if test $ac_cv_struct_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36279,16 +36907,16 @@
+@@ -36279,16 +39308,16 @@
fi
# check for SLP
@@ -29895,8 +38284,53 @@
save_slptest_LIBS="$LIBS"
save_slptest_LDFLAGS="$LDFLAGS"
save_slptest_CPPFLAGS="$CPPFLAGS"
-@@ -36343,19 +36971,20 @@
+@@ -36315,24 +39344,36 @@
+ }
_ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36343,20 +39384,21 @@
+ _ACEOF
LIB_SLP="-lslp"
- echo "$as_me:$LINENO: result: yes" >&5
@@ -29916,11 +38350,13 @@
LIB_SLP=""
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS=$save_slptest_CPPFLAGS
-@@ -36376,13 +37005,13 @@
+ LDFLAGS=$save_slptest_LDFLAGS
+@@ -36376,13 +39418,13 @@
else
kde_check_threading_default=yes
fi
@@ -29938,7 +38374,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36407,28 +37036,27 @@
+@@ -36407,28 +39449,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -29974,18 +38410,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36490,8 +37118,9 @@
+@@ -36464,24 +39505,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36490,9 +39543,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_gl="no"
+ ac_cv_have_gl="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -36507,8 +37136,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -36507,8 +39561,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -29996,7 +38479,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -36528,8 +37157,8 @@
+@@ -36528,8 +39582,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -30007,7 +38490,7 @@
fi
fi
-@@ -36537,8 +37166,8 @@
+@@ -36537,8 +39591,8 @@
@@ -30018,16 +38501,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -36550,7 +37179,7 @@
+@@ -36550,7 +39604,7 @@
do
for j in qsql.html;
do
- echo "configure: 36553: $i/$j" >&5
-+ echo "configure: 37182: $i/$j" >&5
++ echo "configure: 39607: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -36559,20 +37188,20 @@
+@@ -36559,20 +39613,20 @@
done
done
@@ -30053,7 +38536,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36615,12 +37244,12 @@
+@@ -36615,12 +39669,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30070,7 +38553,7 @@
DOT=$kde_cv_path
fi
-@@ -36632,14 +37261,14 @@
+@@ -36632,14 +39686,14 @@
fi
@@ -30088,7 +38571,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36682,12 +37311,12 @@
+@@ -36682,12 +39736,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30105,7 +38588,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -36706,8 +37335,8 @@
+@@ -36706,8 +39760,8 @@
@@ -30116,15 +38599,61 @@
if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36758,12 +37387,13 @@
+@@ -36732,24 +39786,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36758,12 +39824,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_struct_tm_gmtoff=no
+ ac_cv_struct_tm_gmtoff=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6
@@ -30133,7 +38662,7 @@
if test $ac_cv_struct_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36776,10 +37406,9 @@
+@@ -36776,10 +39843,9 @@
@@ -30145,7 +38674,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36792,18 +37421,19 @@
+@@ -36792,18 +39858,19 @@
for ac_header in knotifydialog.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30173,17 +38702,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36840,15 +37470,16 @@
+@@ -36814,24 +39881,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -36840,15 +39919,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -30195,7 +38770,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36882,9 +37513,10 @@
+@@ -36857,8 +39937,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -36882,9 +39967,10 @@
ac_header_preproc=no
fi
@@ -30208,7 +38799,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36908,25 +37540,19 @@
+@@ -36908,25 +39994,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;}
@@ -30241,7 +38832,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36949,10 +37575,9 @@
+@@ -36949,10 +40029,9 @@
KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui'
@@ -30254,7 +38845,7 @@
if test $enableval = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36967,7 +37592,8 @@
+@@ -36967,7 +40046,8 @@
else
COMPILESMPPPDCS=
@@ -30264,7 +38855,7 @@
if test -n "$COMPILESMPPPDCS"; then
-@@ -36980,14 +37606,14 @@
+@@ -36980,14 +40060,14 @@
@@ -30282,7 +38873,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37030,15 +37656,15 @@
+@@ -37030,15 +40110,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30302,7 +38893,7 @@
XML_CONFIG=$kde_cv_path
fi
-@@ -37061,14 +37687,14 @@
+@@ -37061,14 +40141,14 @@
LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
@@ -30320,7 +38911,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37111,12 +37737,12 @@
+@@ -37111,12 +40191,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30337,7 +38928,7 @@
XMLLINT=$kde_cv_path
fi
-@@ -37135,14 +37761,14 @@
+@@ -37135,14 +40215,14 @@
@@ -30355,7 +38946,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37185,15 +37811,15 @@
+@@ -37185,15 +40265,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30375,7 +38966,7 @@
XSLT_CONFIG=$kde_cv_path
fi
-@@ -37250,8 +37876,8 @@
+@@ -37250,8 +40330,8 @@
# -- Check for installed Valgrind headers --------------------
@@ -30386,7 +38977,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -37300,9 +37926,10 @@
+@@ -37273,24 +40353,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37300,10 +40392,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30394,12 +39030,14 @@
+ ac_have_valgrind_h=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_have_valgrind_h = yes; then
-@@ -37313,15 +37940,15 @@
+@@ -37313,15 +40406,15 @@
+
fi
-echo "$as_me:$LINENO: result: $ac_have_valgrind_h" >&5
@@ -30418,7 +39056,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37332,12 +37959,13 @@
+@@ -37332,36 +40425,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30434,15 +39072,60 @@
return 0;
;
return 0;
-@@ -37370,20 +37998,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37370,20 +40476,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
+ ac_cv_type_int=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -30462,7 +39145,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -37396,10 +38025,11 @@
+@@ -37396,10 +40503,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30475,7 +39158,52 @@
test_array [0] = 0
;
-@@ -37437,10 +38067,11 @@
+@@ -37407,24 +40515,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37437,10 +40557,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30488,7 +39216,52 @@
test_array [0] = 0
;
-@@ -37474,30 +38105,32 @@
+@@ -37448,24 +40569,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37474,30 +40607,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30505,8 +39278,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30529,7 +39303,52 @@
test_array [0] = 0
;
-@@ -37535,10 +38168,11 @@
+@@ -37505,24 +40640,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37535,10 +40682,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30542,7 +39361,52 @@
test_array [0] = 0
;
-@@ -37572,23 +38206,26 @@
+@@ -37546,24 +40694,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37572,24 +40732,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30559,8 +39423,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30569,14 +39434,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -37600,10 +38237,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -37600,10 +40763,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30589,15 +39457,61 @@
test_array [0] = 0
;
-@@ -37637,26 +38275,20 @@
+@@ -37611,24 +40775,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37637,26 +40813,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -30621,7 +39535,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37664,8 +38296,9 @@
+@@ -37664,8 +40834,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30633,7 +39547,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -37674,22 +38307,22 @@
+@@ -37674,35 +40845,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30665,7 +39579,33 @@
;
return 0;
-@@ -37713,28 +38346,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37713,28 +40893,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30702,7 +39642,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37745,12 +38377,13 @@
+@@ -37745,36 +40924,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30718,15 +39658,60 @@
return 0;
;
return 0;
-@@ -37783,20 +38416,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37783,20 +40975,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
+ ac_cv_type_short=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -30746,7 +39731,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -37809,10 +38443,11 @@
+@@ -37809,10 +41002,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30759,7 +39744,52 @@
test_array [0] = 0
;
-@@ -37850,10 +38485,11 @@
+@@ -37820,24 +41014,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37850,10 +41056,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30772,7 +39802,52 @@
test_array [0] = 0
;
-@@ -37887,30 +38523,32 @@
+@@ -37861,24 +41068,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37887,30 +41106,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30789,8 +39864,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30813,7 +39889,52 @@
test_array [0] = 0
;
-@@ -37948,10 +38586,11 @@
+@@ -37918,24 +41139,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37948,10 +41181,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30826,7 +39947,52 @@
test_array [0] = 0
;
-@@ -37985,23 +38624,26 @@
+@@ -37959,24 +41193,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -37985,24 +41231,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30843,8 +40009,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30853,14 +40020,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -38013,10 +38655,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -38013,10 +41262,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30873,15 +40043,61 @@
test_array [0] = 0
;
-@@ -38050,26 +38693,20 @@
+@@ -38024,24 +41274,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38050,26 +41312,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -30905,7 +40121,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38077,8 +38714,9 @@
+@@ -38077,8 +41333,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30917,7 +40133,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -38087,22 +38725,22 @@
+@@ -38087,35 +41344,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30949,7 +40165,33 @@
;
return 0;
-@@ -38126,28 +38764,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38126,28 +41392,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30986,7 +40228,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38158,12 +38795,13 @@
+@@ -38158,36 +41423,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31002,15 +40244,60 @@
return 0;
;
return 0;
-@@ -38196,20 +38834,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38196,20 +41474,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -31030,7 +40317,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -38222,10 +38861,11 @@
+@@ -38222,10 +41501,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31043,7 +40330,52 @@
test_array [0] = 0
;
-@@ -38263,10 +38903,11 @@
+@@ -38233,24 +41513,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38263,10 +41555,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31056,7 +40388,52 @@
test_array [0] = 0
;
-@@ -38300,30 +38941,32 @@
+@@ -38274,24 +41567,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38300,30 +41605,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31073,8 +40450,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31097,7 +40475,52 @@
test_array [0] = 0
;
-@@ -38361,10 +39004,11 @@
+@@ -38331,24 +41638,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38361,10 +41680,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31110,7 +40533,52 @@
test_array [0] = 0
;
-@@ -38398,23 +39042,26 @@
+@@ -38372,24 +41692,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38398,24 +41730,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31127,8 +40595,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31137,14 +40606,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -38426,10 +39073,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -38426,10 +41761,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31157,15 +40629,61 @@
test_array [0] = 0
;
-@@ -38463,26 +39111,20 @@
+@@ -38437,24 +41773,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38463,26 +41811,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -31189,7 +40707,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38490,8 +39132,9 @@
+@@ -38490,8 +41832,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31201,7 +40719,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -38500,22 +39143,22 @@
+@@ -38500,35 +41843,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31233,7 +40751,33 @@
;
return 0;
-@@ -38539,28 +39182,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38539,28 +41891,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31270,7 +40814,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38571,12 +39213,13 @@
+@@ -38571,36 +41922,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31286,15 +40830,60 @@
return 0;
;
return 0;
-@@ -38609,20 +39252,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38609,20 +41973,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_char_p=no
+ ac_cv_type_char_p=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -31314,7 +40903,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -38635,10 +39279,11 @@
+@@ -38635,10 +42000,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31327,7 +40916,52 @@
test_array [0] = 0
;
-@@ -38676,10 +39321,11 @@
+@@ -38646,24 +42012,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38676,10 +42054,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31340,7 +40974,52 @@
test_array [0] = 0
;
-@@ -38713,30 +39359,32 @@
+@@ -38687,24 +42066,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38713,30 +42104,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31357,8 +41036,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31381,7 +41061,52 @@
test_array [0] = 0
;
-@@ -38774,10 +39422,11 @@
+@@ -38744,24 +42137,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38774,10 +42179,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31394,7 +41119,52 @@
test_array [0] = 0
;
-@@ -38811,23 +39460,26 @@
+@@ -38785,24 +42191,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38811,24 +42229,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31411,8 +41181,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31421,14 +41192,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -38839,10 +39491,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -38839,10 +42260,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31441,15 +41215,61 @@
test_array [0] = 0
;
-@@ -38876,26 +39529,20 @@
+@@ -38850,24 +42272,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38876,26 +42310,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -31473,7 +41293,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38903,8 +39550,9 @@
+@@ -38903,8 +42331,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31485,7 +41305,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -38913,22 +39561,22 @@
+@@ -38913,35 +42342,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31517,7 +41337,33 @@
;
return 0;
-@@ -38952,22 +39600,21 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -38952,22 +42390,21 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31546,7 +41392,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
_ACEOF
-@@ -38988,8 +39635,7 @@
+@@ -38988,8 +42425,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31556,7 +41402,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38999,17 +39645,17 @@
+@@ -38999,17 +42435,17 @@
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -31580,17 +41426,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39046,15 +39692,16 @@
+@@ -39020,24 +42456,36 @@
+ #include <X11/extensions/Xrender.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39046,15 +42494,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -31602,7 +41494,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39088,9 +39735,10 @@
+@@ -39063,8 +42512,13 @@
+ /* end confdefs.h. */
+ #include <X11/extensions/Xrender.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -39088,9 +42542,10 @@
ac_header_preproc=no
fi
@@ -31615,7 +41523,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -39114,25 +39762,18 @@
+@@ -39114,25 +42569,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;}
@@ -31646,7 +41554,7 @@
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -39160,8 +39801,8 @@
+@@ -39160,8 +42608,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -31657,7 +41565,7 @@
if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39174,17 +39815,17 @@
+@@ -39174,40 +42622,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31679,15 +41587,59 @@
;
return 0;
}
-@@ -39216,14 +39857,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39216,14 +42676,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xrender_XRenderComposite=no
+ ac_cv_lib_Xrender_XRenderComposite=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -31698,7 +41650,7 @@
if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
LIB_XRENDER=-lXrender
-@@ -39246,18 +39888,19 @@
+@@ -39246,18 +42707,19 @@
for ac_header in tgmath.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31726,17 +41678,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39294,15 +39937,16 @@
+@@ -39268,24 +42730,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39294,15 +42768,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -31748,7 +41746,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39336,9 +39980,10 @@
+@@ -39311,8 +42786,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -39336,9 +42816,10 @@
ac_header_preproc=no
fi
@@ -31761,7 +41775,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39362,25 +40007,19 @@
+@@ -39362,25 +42843,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;}
@@ -31794,7 +41808,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39400,8 +40039,7 @@
+@@ -39400,8 +42875,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31804,7 +41818,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39410,8 +40048,8 @@
+@@ -39410,8 +42884,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -31815,15 +41829,61 @@
if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39454,16 +40092,17 @@
+@@ -39428,24 +42902,36 @@
+ #include <X11/extensions/scrnsaver.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39454,16 +42940,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_X11_extensions_scrnsaver_h=no
+ ac_cv_header_X11_extensions_scrnsaver_h=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
@@ -31838,7 +41898,7 @@
if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39476,17 +40115,17 @@
+@@ -39476,40 +42963,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31860,15 +41920,59 @@
;
return 0;
}
-@@ -39518,14 +40157,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39518,14 +43017,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+ ac_cv_lib_Xext_XScreenSaverQueryInfo=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -31879,7 +41983,7 @@
if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
-@@ -39539,16 +40179,15 @@
+@@ -39539,16 +43039,15 @@
ld_shared_flag=
@@ -31900,14 +42004,60 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39601,11 +40240,13 @@
+@@ -39575,24 +43074,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39601,11 +43112,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
- ac_ext=cc
@@ -31915,7 +42065,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39615,19 +40256,19 @@
+@@ -39615,19 +43128,19 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -31941,7 +42091,7 @@
if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39640,17 +40281,17 @@
+@@ -39640,40 +43153,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31963,15 +42113,59 @@
;
return 0;
}
-@@ -39682,14 +40323,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39682,14 +43207,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+ ac_cv_lib_Xss_XScreenSaverQueryInfo=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -31982,7 +42176,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-@@ -39749,18 +40391,18 @@
+@@ -39749,18 +43275,18 @@
@@ -32007,7 +42201,52 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39813,9 +40455,10 @@
+@@ -39787,24 +43313,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -39813,10 +43351,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32015,11 +42254,13 @@
+ ac_cv_have_xmms="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
-@@ -39824,8 +40467,8 @@
+ LDFLAGS="$ac_LDFLAGS_save"
+@@ -39824,8 +43363,8 @@
fi
@@ -32030,7 +42271,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -39865,31 +40508,31 @@
+@@ -39865,31 +43404,31 @@
ac_libgadu_libs=""
@@ -32074,7 +42315,7 @@
if test "$ac_libgadu_libs" != "" ; then
LIBGG_LIBS="-L$ac_libgadu_libs"
-@@ -39900,8 +40543,8 @@
+@@ -39900,8 +43439,8 @@
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
CFLAGS="$CFLAGS $LIBGG_INCLUDES"
@@ -32085,7 +42326,7 @@
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
-@@ -39924,8 +40567,20 @@
+@@ -39924,8 +43463,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -32108,7 +42349,32 @@
if ( maj != 1 ) {
return 1;
}
-@@ -39955,8 +40610,8 @@
+@@ -39943,20 +43494,29 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
@@ -32119,7 +42385,7 @@
COMPILE_GADU=true
use_libgadu_copy=
-@@ -39967,12 +40622,14 @@
+@@ -39967,12 +43527,14 @@
( exit $ac_status )
@@ -32137,7 +42403,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -39984,16 +40641,16 @@
+@@ -39984,16 +43546,16 @@
fi
if test -z "$COMPILE_GADU"; then
@@ -32160,7 +42426,7 @@
use_libgadu_copy=
COMPILE_GADU=
fi
-@@ -40034,15 +40691,14 @@
+@@ -40034,15 +43596,14 @@
fi
@@ -32179,18 +42445,65 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -40096,8 +40752,9 @@
+@@ -40070,24 +43631,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40096,9 +43669,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_c_long_long=no
+ kde_cv_c_long_long=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -40109,8 +40766,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -40109,8 +43683,8 @@
fi
@@ -32201,7 +42514,7 @@
if test "$kde_cv_c_long_long" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40134,26 +40791,26 @@
+@@ -40134,26 +43708,26 @@
ssl_libraries=""
ssl_includes=""
@@ -32238,16 +42551,61 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -40168,7 +40825,7 @@
+@@ -40168,7 +43742,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 40171: $i/$j" >&5
-+ echo "configure: 40828: $i/$j" >&5
++ echo "configure: 43745: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -40242,9 +40899,10 @@
+@@ -40215,24 +43789,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40242,10 +43828,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32255,11 +42613,13 @@
+ ac_ssl_rsaref="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -40263,26 +40921,26 @@
+ LDFLAGS="$ac_ldflags_safe"
+@@ -40263,26 +43850,26 @@
eval "$ac_cv_have_ssl"
@@ -32299,7 +42659,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40355,8 +41013,8 @@
+@@ -40355,8 +43942,8 @@
eval "$ac_cv_ssl_version"
@@ -32310,7 +42670,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -40414,8 +41072,8 @@
+@@ -40414,8 +44001,8 @@
mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
fi
@@ -32321,8 +42681,32 @@
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
-@@ -40450,8 +41108,8 @@
+@@ -40439,19 +44026,28 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
@@ -32332,7 +42716,7 @@
sed -e "s/#undef __GG_LIBGADU_HAVE_C99_VSNPRINTF/#define __GG_LIBGADU_HAVE_C99_VSNPRINTF/" \
${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
-@@ -40465,19 +41123,21 @@
+@@ -40465,19 +44061,21 @@
( exit $ac_status )
@@ -32360,7 +42744,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40503,30 +41163,24 @@
+@@ -40503,53 +44101,59 @@
#undef $ac_func
@@ -32396,15 +42780,59 @@
;
return 0;
}
-@@ -40558,13 +41212,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40558,13 +44162,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32415,7 +42843,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -40581,9 +41237,9 @@
+@@ -40581,9 +44187,9 @@
for ac_func in _va_copy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32428,7 +42856,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40609,30 +41265,24 @@
+@@ -40609,53 +44215,59 @@
#undef $ac_func
@@ -32464,15 +42892,59 @@
;
return 0;
}
-@@ -40664,13 +41314,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40664,13 +44276,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32483,7 +42955,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -40687,13 +41339,13 @@
+@@ -40687,13 +44301,13 @@
@@ -32501,7 +42973,7 @@
if test "$libidn" != "no"; then
if test "$libidn" != "yes"; then
-@@ -40706,8 +41358,7 @@
+@@ -40706,8 +44320,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -32511,7 +42983,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'
-@@ -40717,17 +41368,17 @@
+@@ -40717,17 +44330,17 @@
if test "${ac_cv_header_idna_h+set}" = set; then
@@ -32535,17 +43007,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40764,15 +41415,16 @@
+@@ -40738,24 +44351,36 @@
+ #include <idna.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40764,15 +44389,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -32557,7 +43075,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40806,9 +41458,10 @@
+@@ -40781,8 +44407,13 @@
+ /* end confdefs.h. */
+ #include <idna.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -40806,9 +44437,10 @@
ac_header_preproc=no
fi
@@ -32570,7 +43104,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40832,25 +41485,18 @@
+@@ -40832,25 +44464,18 @@
echo "$as_me: WARNING: idna.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: idna.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: idna.h: in the future, the compiler will take precedence" >&2;}
@@ -32601,7 +43135,7 @@
fi
if test $ac_cv_header_idna_h = yes; then
-@@ -40879,8 +41525,8 @@
+@@ -40879,8 +44504,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -32612,7 +43146,7 @@
if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40893,17 +41539,17 @@
+@@ -40893,40 +44518,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32634,15 +43168,59 @@
;
return 0;
}
-@@ -40935,14 +41581,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -40935,14 +44572,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_idn_stringprep_check_version=no
+ ac_cv_lib_idn_stringprep_check_version=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32653,7 +43231,7 @@
if test $ac_cv_lib_idn_stringprep_check_version = yes; then
libidn=yes; IDN_LIBS="-lidn"
else
-@@ -40965,10 +41612,10 @@
+@@ -40965,10 +44603,10 @@
echo "$as_me: WARNING: Libidn not found, Kopete Jabber plugin will not be compiled" >&2;}
fi
@@ -32668,7 +43246,7 @@
-@@ -40985,26 +41632,21 @@
+@@ -40985,26 +44623,21 @@
@@ -32701,7 +43279,7 @@
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-@@ -41018,8 +41660,8 @@
+@@ -41018,8 +44651,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
@@ -32712,7 +43290,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41034,28 +41676,29 @@
+@@ -41034,28 +44667,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32748,7 +43326,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -41066,31 +41709,31 @@
+@@ -41066,31 +44700,31 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -32797,7 +43375,7 @@
fi
-@@ -41103,14 +41746,24 @@
+@@ -41103,14 +44737,24 @@
fi
if test $succeeded = yes; then
@@ -32825,7 +43403,7 @@
# Check and setup for GLib library
-@@ -41127,8 +41780,8 @@
+@@ -41127,8 +44771,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
@@ -32836,7 +43414,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41143,28 +41796,29 @@
+@@ -41143,28 +44787,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -32872,7 +43450,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -41175,25 +41829,25 @@
+@@ -41175,25 +44820,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -32910,7 +43488,7 @@
else
GLIB_CFLAGS=""
GLIB_LIBS=""
-@@ -41222,21 +41876,20 @@
+@@ -41222,21 +44867,20 @@
@@ -32932,17 +43510,17 @@
-echo $ECHO_N "checking if Sametime Plugin should be compiled... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $compile_meanwhile" >&5
-echo "${ECHO_T}$compile_meanwhile" >&6
--
--# Here we go
+# Set the flag to compile meanwhile
+-# Here we go
+-
-if test "x$compile_meanwhile" = "xyes"; then
+if test "x$enable_meanwhile" != "xno"; then
include_meanwhile_TRUE=
include_meanwhile_FALSE='#'
else
-@@ -41245,18 +41898,14 @@
+@@ -41245,18 +44889,14 @@
fi
@@ -32965,7 +43543,7 @@
if test "$with_testbed" = "yes"; then
-@@ -41276,10 +41925,10 @@
+@@ -41276,10 +44916,10 @@
msn_webcam_val=1
fi
@@ -32980,7 +43558,7 @@
cat >>confdefs.h <<_ACEOF
#define MSN_WEBCAM $msn_webcam_val
-@@ -41301,8 +41950,8 @@
+@@ -41301,8 +44941,8 @@
# Checks for typedefs, structures, and compiler characteristics.
@@ -32991,15 +43569,106 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41397,14 +42046,15 @@
+@@ -41328,24 +44968,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41371,24 +45023,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41397,14 +45061,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33009,7 +43678,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -41414,11 +42064,11 @@
+@@ -41414,11 +45079,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33025,17 +43694,64 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -41465,7 +42115,9 @@
+@@ -41429,24 +45094,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41465,8 +45142,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41474,17 +42126,22 @@
+ /* confdefs.h. */
+@@ -41474,27 +45153,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33061,7 +43777,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -41507,13 +42164,16 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41507,13 +45200,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -33071,8 +43810,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -33081,7 +43821,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -41531,8 +42191,8 @@
+@@ -41531,8 +45227,8 @@
{ (exit 1); exit 1; }; } ;;
esac
@@ -33092,7 +43832,7 @@
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41572,6 +42232,7 @@
+@@ -41572,6 +45268,7 @@
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -33100,7 +43840,7 @@
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -41590,7 +42251,9 @@
+@@ -41590,7 +45287,9 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -33110,15 +43850,61 @@
#endif
;
-@@ -41624,12 +42287,13 @@
+@@ -41598,24 +45297,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41624,12 +45335,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_const=no
+ ac_cv_c_const=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
@@ -33127,7 +43913,7 @@
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -41638,8 +42302,8 @@
+@@ -41638,8 +45350,8 @@
fi
@@ -33138,9 +43924,50 @@
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41680,18 +42344,21 @@
+@@ -41659,39 +45371,54 @@
+
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_c_inline=$ac_kw; break
+ ac_cv_c_inline=$ac_kw
@@ -33150,8 +43977,9 @@
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
done
@@ -33163,7 +43991,7 @@
case $ac_cv_c_inline in
-@@ -41709,8 +42376,8 @@
+@@ -41709,8 +45436,8 @@
;;
esac
@@ -33174,7 +44002,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41721,12 +42388,13 @@
+@@ -41721,36 +45448,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33190,15 +44018,60 @@
return 0;
;
return 0;
-@@ -41759,24 +42427,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41759,24 +45499,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ ac_cv_type_size_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -33222,15 +44095,61 @@
if test "${ac_cv_struct_tm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41824,12 +42493,13 @@
+@@ -41798,24 +45539,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41824,12 +45577,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
@@ -33239,7 +44158,7 @@
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
-@@ -41839,8 +42509,8 @@
+@@ -41839,8 +45593,8 @@
fi
@@ -33250,7 +44169,7 @@
if test "${ac_cv_type_uint8_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41851,12 +42521,13 @@
+@@ -41851,36 +45605,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33266,15 +44185,60 @@
return 0;
;
return 0;
-@@ -41889,12 +42560,13 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41889,12 +45656,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_uint8_t=no
+ ac_cv_type_uint8_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
@@ -33283,7 +44247,7 @@
if test $ac_cv_type_uint8_t = yes; then
:
else
-@@ -41905,8 +42577,8 @@
+@@ -41905,8 +45673,8 @@
fi
@@ -33294,7 +44258,7 @@
if test "${ac_cv_type_uint32_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41917,12 +42589,13 @@
+@@ -41917,36 +45685,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33310,15 +44274,60 @@
return 0;
;
return 0;
-@@ -41955,12 +42628,13 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41955,12 +45736,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_uint32_t=no
+ ac_cv_type_uint32_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
@@ -33327,7 +44336,7 @@
if test $ac_cv_type_uint32_t = yes; then
:
else
-@@ -41971,8 +42645,8 @@
+@@ -41971,8 +45753,8 @@
fi
@@ -33338,7 +44347,7 @@
if test "${ac_cv_type_uint64_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41983,12 +42657,13 @@
+@@ -41983,36 +45765,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33354,15 +44363,60 @@
return 0;
;
return 0;
-@@ -42021,12 +42696,13 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42021,12 +45816,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_uint64_t=no
+ ac_cv_type_uint64_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
@@ -33371,7 +44425,7 @@
if test $ac_cv_type_uint64_t = yes; then
:
else
-@@ -42042,9 +42718,9 @@
+@@ -42042,9 +45838,9 @@
for ac_func in strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33384,7 +44438,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42070,30 +42746,24 @@
+@@ -42070,53 +45866,59 @@
#undef $ac_func
@@ -33420,15 +44474,59 @@
;
return 0;
}
-@@ -42125,13 +42795,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42125,13 +45927,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -33439,7 +44537,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42144,11 +42816,11 @@
+@@ -42144,11 +45948,11 @@
# Checks for library functions.
@@ -33454,7 +44552,7 @@
if test "$with_struct_callbacks" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -42172,14 +42844,13 @@
+@@ -42172,14 +45976,13 @@
YAHOOPKGREQ=""
@@ -33472,9 +44570,50 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42259,17 +42930,18 @@
+@@ -42238,39 +46041,52 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
@@ -33492,11 +44631,13 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -42283,18 +42955,19 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -42283,18 +46099,19 @@
for ac_header in sys/param.h string.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33524,17 +44665,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42331,15 +43004,16 @@
+@@ -42305,24 +46122,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42331,15 +46160,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -33546,7 +44733,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42373,9 +43047,10 @@
+@@ -42348,8 +46178,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -42373,9 +46208,10 @@
ac_header_preproc=no
fi
@@ -33559,7 +44762,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -42399,25 +43074,19 @@
+@@ -42399,25 +46235,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;}
@@ -33592,7 +44795,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -42434,8 +43103,7 @@
+@@ -42434,8 +46264,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33602,7 +44805,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42444,8 +43112,8 @@
+@@ -42444,8 +46273,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -33613,15 +44816,61 @@
if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42488,12 +43156,13 @@
+@@ -42462,24 +46291,36 @@
+ #include <X11/extensions/xf86vmode.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42488,12 +46329,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_X11_extensions_xf86vmode_h=no
+ ac_cv_header_X11_extensions_xf86vmode_h=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6
@@ -33630,7 +44879,7 @@
if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
-@@ -42524,26 +43193,26 @@
+@@ -42524,26 +46366,26 @@
ssl_libraries=""
ssl_includes=""
@@ -33667,16 +44916,61 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -42558,7 +43227,7 @@
+@@ -42558,7 +46400,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 42561: $i/$j" >&5
-+ echo "configure: 43230: $i/$j" >&5
++ echo "configure: 46403: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42632,9 +43301,10 @@
+@@ -42605,24 +46447,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42632,10 +46486,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33684,11 +44978,13 @@
+ ac_ssl_rsaref="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -42653,26 +43323,26 @@
+ LDFLAGS="$ac_ldflags_safe"
+@@ -42653,26 +46508,26 @@
eval "$ac_cv_have_ssl"
@@ -33728,7 +45024,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42745,8 +43415,8 @@
+@@ -42745,8 +46600,8 @@
eval "$ac_cv_ssl_version"
@@ -33739,7 +45035,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -42806,8 +43476,7 @@
+@@ -42806,8 +46661,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -33749,7 +45045,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42817,17 +43486,17 @@
+@@ -42817,17 +46671,17 @@
if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
@@ -33773,17 +45069,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42864,15 +43533,16 @@
+@@ -42838,24 +46692,36 @@
+ #include <X11/extensions/XTest.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42864,15 +46730,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -33795,7 +45137,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42906,9 +43576,10 @@
+@@ -42881,8 +46748,13 @@
+ /* end confdefs.h. */
+ #include <X11/extensions/XTest.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -42906,9 +46778,10 @@
ac_header_preproc=no
fi
@@ -33808,7 +45166,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42932,25 +43603,18 @@
+@@ -42932,25 +46805,18 @@
echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
@@ -33839,7 +45197,7 @@
fi
if test $ac_cv_header_X11_extensions_XTest_h = yes; then
-@@ -42972,8 +43636,8 @@
+@@ -42972,8 +46838,8 @@
#check for getifaddrs(3) (as in glibc >= 2.3 and newer bsds)
@@ -33850,7 +45208,52 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43023,8 +43687,8 @@
+@@ -42996,24 +46862,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43023,8 +46901,8 @@
#define HAVE_GETIFADDRS 1
_ACEOF
@@ -33861,7 +45264,7 @@
COMPILE_GETIFADDRS=""
else
-@@ -43032,11 +43696,12 @@
+@@ -43032,12 +46910,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33872,14 +45275,16 @@
COMPILE_GETIFADDRS="getifaddrs.cpp"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -43047,8 +43712,8 @@
+@@ -43047,8 +46926,8 @@
+
-echo "$as_me:$LINENO: checking ktalkd find_user method" >&5
-echo $ECHO_N "checking ktalkd find_user method... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking ktalkd find_user method" >&5
@@ -33887,7 +45292,7 @@
if test -n "`echo $target_os | grep linux`" ; then
if test -d /proc; then
-@@ -43072,15 +43737,15 @@
+@@ -43072,15 +46951,15 @@
_ACEOF
@@ -33909,7 +45314,7 @@
fi
-@@ -43099,8 +43764,8 @@
+@@ -43099,8 +46978,8 @@
@@ -33920,7 +45325,7 @@
if test "${kde_cv_utmp_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -43131,12 +43796,12 @@
+@@ -43131,12 +47010,12 @@
_ACEOF
@@ -33937,7 +45342,7 @@
fi
-@@ -43146,8 +43811,8 @@
+@@ -43146,8 +47025,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -33948,7 +45353,7 @@
if test "${ac_cv_lib_bsd_bsd_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43160,17 +43825,17 @@
+@@ -43160,40 +47039,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33970,15 +45375,59 @@
;
return 0;
}
-@@ -43202,14 +43867,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43202,14 +47093,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_bsd_ioctl=no
+ ac_cv_lib_bsd_bsd_ioctl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33989,7 +45438,7 @@
if test $ac_cv_lib_bsd_bsd_ioctl = yes; then
LIBBSD="-lbsd"
fi
-@@ -43221,18 +43887,19 @@
+@@ -43221,18 +47113,19 @@
for ac_header in sgtty.h bsd/sgtty.h sys/select.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34017,17 +45466,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43269,15 +43936,16 @@
+@@ -43243,24 +47136,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43269,15 +47174,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -34039,7 +45534,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43311,9 +43979,10 @@
+@@ -43286,8 +47192,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -43311,9 +47222,10 @@
ac_header_preproc=no
fi
@@ -34052,7 +45563,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43337,25 +44006,19 @@
+@@ -43337,25 +47249,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;}
@@ -34085,7 +45596,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43368,8 +44031,8 @@
+@@ -43368,8 +47274,8 @@
done
@@ -34096,15 +45607,61 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43419,12 +44082,13 @@
+@@ -43393,24 +47299,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43419,12 +47337,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -34113,7 +45670,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -43434,7 +44098,7 @@
+@@ -43434,7 +47353,7 @@
fi
@@ -34122,7 +45679,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43448,8 +44112,8 @@
+@@ -43448,8 +47367,8 @@
if test "$GCC" = "yes"; then
CXXFLAGS="$CXXFLAGS -pedantic-errors"
fi
@@ -34133,15 +45690,61 @@
if test "${ac_cv_scandir_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43502,14 +44166,15 @@
+@@ -43476,24 +47395,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43502,14 +47433,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_scandir_const=no
+ ac_cv_scandir_const=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -34152,7 +45755,7 @@
if eval "test \"`echo $ac_cv_scandir_const`\" = yes"; then
-@@ -43525,9 +44190,9 @@
+@@ -43525,9 +47457,9 @@
for ac_func in getifaddrs getnameinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34165,7 +45768,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -43553,30 +44218,24 @@
+@@ -43553,53 +47485,59 @@
#undef $ac_func
@@ -34201,15 +45804,59 @@
;
return 0;
}
-@@ -43608,13 +44267,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43608,13 +47546,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -34220,7 +45867,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -43623,8 +44284,8 @@
+@@ -43623,8 +47563,8 @@
fi
done
@@ -34231,7 +45878,52 @@
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43675,7 +44336,7 @@
+@@ -43649,24 +47589,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43675,7 +47627,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34240,18 +45932,65 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -43722,14 +44383,16 @@
+@@ -43696,24 +47648,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -43722,14 +47686,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_member_struct_sockaddr_sa_len=no
+ ac_cv_member_struct_sockaddr_sa_len=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
@@ -34260,7 +45999,7 @@
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -43741,19 +44404,18 @@
+@@ -43741,19 +47707,18 @@
@@ -34285,7 +46024,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43762,8 +44424,8 @@
+@@ -43762,8 +47727,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -34296,8 +46035,50 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43807,22 +44469,23 @@
+@@ -43785,44 +47750,57 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
kde_libiw_installed=yes
- echo "$as_me:$LINENO: result: yes" >&5
@@ -34317,19 +46098,61 @@
+echo "${ECHO_T}no" >&6; }
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: checking if wireless tools >= 27 are installed" >&5
-echo $ECHO_N "checking if wireless tools >= 27 are installed... $ECHO_C" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: checking if wireless tools >= 27 are installed" >&5
+echo $ECHO_N "checking if wireless tools >= 27 are installed... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43869,23 +44532,23 @@
+@@ -43848,44 +47826,56 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
@@ -34357,9 +46180,50 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43930,8 +44593,8 @@
+@@ -43909,29 +47899,41 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
@@ -34368,7 +46232,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_IW_27pre19 1
-@@ -43943,17 +44606,19 @@
+@@ -43943,17 +47945,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34378,20 +46242,22 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=cc
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43991,8 +44656,8 @@
+@@ -43991,8 +47995,8 @@
fi
for i in $ac_topsubdirs; do
@@ -34402,7 +46268,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -44003,8 +44668,8 @@
+@@ -44003,8 +48007,8 @@
else
install_it="no"
fi
@@ -34413,7 +46279,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -44196,651 +44861,651 @@
+@@ -44196,651 +48200,651 @@
dcoprss_SUBDIR_included_FALSE=
fi
@@ -35388,7 +47254,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -44860,39 +45525,58 @@
+@@ -44860,39 +48864,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -35463,7 +47329,7 @@
fi
fi
rm -f confcache
-@@ -44901,38 +45585,31 @@
+@@ -44901,38 +48924,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -35515,7 +47381,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -45202,11 +45879,35 @@
+@@ -45202,11 +49218,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -35553,7 +47419,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -45215,8 +45916,43 @@
+@@ -45215,8 +49255,43 @@
fi
@@ -35598,7 +47464,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -45230,18 +45966,19 @@
+@@ -45230,18 +49305,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -35621,7 +47487,7 @@
as_basename=basename
else
as_basename=false
-@@ -45249,159 +45986,120 @@
+@@ -45249,159 +49325,120 @@
# Name of the executable.
@@ -35793,7 +47659,7 @@
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
@@ -35852,7 +47718,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -45410,7 +46108,19 @@
+@@ -45410,7 +49447,19 @@
as_mkdir_p=false
fi
@@ -35873,7 +47739,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -45419,31 +46129,14 @@
+@@ -45419,31 +49468,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -35905,11 +47771,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.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -45451,30 +46144,20 @@
+@@ -45451,30 +49483,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -35948,7 +47814,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -45501,19 +46184,21 @@
+@@ -45501,19 +49523,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -35959,8 +47825,9 @@
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
-+configured by $0, generated by GNU Autoconf 2.59d,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.60,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
@@ -35975,7 +47842,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -45524,39 +46209,24 @@
+@@ -45524,39 +49548,24 @@
do
case $1 in
--*=*)
@@ -36021,7 +47888,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -45566,18 +46236,24 @@
+@@ -45566,18 +49575,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -36051,16 +47918,16 @@
esac
shift
-@@ -45593,359 +46269,371 @@
+@@ -45593,359 +49608,371 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
-+ exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
@@ -36756,7 +48623,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -45957,590 +46645,782 @@
+@@ -45957,590 +49984,782 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -37294,7 +49161,7 @@
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -37306,10 +49173,10 @@
-fi # test -n "$CONFIG_FILES"
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -37433,7 +49300,7 @@
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -37444,10 +49311,10 @@
+ fi
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -37571,7 +49438,7 @@
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -37582,10 +49449,10 @@
+ fi
+done
+
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -37666,7 +49533,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 54; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -37677,10 +49544,10 @@
+ fi
+done
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+ ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
@@ -38034,7 +49901,7 @@
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=
++ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
@@ -38046,7 +49913,7 @@
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
-+*datarootdir*) ;;
++*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
@@ -38068,7 +49935,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -46548,248 +47428,122 @@
+@@ -46548,248 +50767,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -38124,6 +49991,14 @@
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined." >&5
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined." >&2;}
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
@@ -38410,7 +50285,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -46800,135 +47554,39 @@
+@@ -46800,135 +50901,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -38572,7 +50447,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -46938,18 +47596,29 @@
+@@ -46938,18 +50943,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
@@ -38610,7 +50485,7 @@
else
continue
fi
-@@ -46971,53 +47640,79 @@
+@@ -46971,53 +50987,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -38723,7 +50598,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -38930,6 +50805,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -821,18 +830,18 @@
+ mocs: feedbrowser.moc
+
+ #>+ 3
+-query.moc: $(srcdir)/query.h
+- $(MOC) $(srcdir)/query.h -o query.moc
++xmlrpciface.moc: $(srcdir)/xmlrpciface.h
++ $(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
+
+ #>+ 2
+-mocs: query.moc
++mocs: xmlrpciface.moc
+
+ #>+ 3
+-xmlrpciface.moc: $(srcdir)/xmlrpciface.h
+- $(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
++query.moc: $(srcdir)/query.h
++ $(MOC) $(srcdir)/query.h -o query.moc
+
+ #>+ 2
+-mocs: xmlrpciface.moc
++mocs: query.moc
+
+ #>+ 3
+ service.moc: $(srcdir)/service.h
+@@ -853,7 +862,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f feedbrowser.moc query.moc xmlrpciface.moc service.moc
++ -rm -f feedbrowser.moc xmlrpciface.moc query.moc service.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh
+@@ -919,7 +928,7 @@
+ rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
+
+ #>+ 11
+-rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp xmlrpciface.moc query.moc service.moc
++rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp query.moc xmlrpciface.moc service.moc
+ @echo 'creating rssservice.all_cpp.cpp ...'; \
+ rm -f rssservice.all_cpp.files rssservice.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
--- doc/kcontrol/kcmktalkd/Makefile.in
+++ doc/kcontrol/kcmktalkd/Makefile.in
@@ -100,6 +100,7 @@
@@ -39209,6 +51127,15 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
+@@ -405,7 +414,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kcmktalkd lanbrowser
++SUBDIRS =. lanbrowser kcmktalkd
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
@@ -413,7 +422,7 @@
all: docs-am all-recursive
@@ -39330,6 +51257,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -582,7 +591,7 @@
+ KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png mainwin.png index.docbook applet.png conf.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png conf.png mainwin.png applet.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
+- @for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++ @for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++ for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++ for file in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kget/Makefile.in
+++ doc/kget/Makefile.in
@@ -100,6 +100,7 @@
@@ -39430,6 +51390,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -579,10 +588,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kget1.png fileopen.png Makefile.in kget5.png kget3.png index.docbook Makefile.am kget4.png kget2.png index.cache.bz2
++KDE_DIST=fileopen.png kget1.png Makefile.in kget5.png kget3.png index.docbook kget4.png Makefile.am kget2.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
+- @for base in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++ @for base in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++ for base in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kget2.png kget3.png kget4.png kget5.png fileopen.png kget1.png ; do \
++ for file in kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/knewsticker/Makefile.in
+++ doc/knewsticker/Makefile.in
@@ -100,6 +100,7 @@
@@ -39530,6 +51527,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -579,10 +588,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in kcmnewsticker-newssources.png kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook checknews-icon.png kcmnewsticker-scrollerprefs.png preferences-icon.png kcmnewsticker-newssitedialog.png newarticle-icon.png kcmnewsticker-filters.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am index.cache.bz2 knewsticker-ownwindow.png oldarticle-icon.png
++KDE_DIST=kcmnewsticker-newssources.png Makefile.in kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook kcmnewsticker-scrollerprefs.png checknews-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png kcmnewsticker-filters.png newarticle-icon.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am oldarticle-icon.png index.cache.bz2 knewsticker-ownwindow.png
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
+- @for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++ @for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++ for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++ for file in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kopete/Makefile.in
+++ doc/kopete/Makefile.in
@@ -100,6 +100,7 @@
@@ -39630,6 +51664,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -582,7 +591,7 @@
+ KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook menus.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) menus.docbook index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
+- @for base in index.docbook menus.docbook ; do \
++ @for base in menus.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook menus.docbook ; do \
++ for base in menus.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook menus.docbook ; do \
++ for file in menus.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kpf/Makefile.in
+++ doc/kpf/Makefile.in
@@ -100,6 +100,7 @@
@@ -39830,6 +51897,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -582,7 +591,7 @@
+ KDE_DIST=kppp-account-ip-tab.png callback.docbook kppp-faq.docbook kppp-account-login-script-tab.png getting-online.docbook kppp-account-dns-tab.png kppp-misc-tab.png kppp-wizard.png index.docbook kppp-graph-tab.png kppp-modem-tab.png dialog-setup.docbook global-settings.docbook accounting.docbook costsgraphs.png chap.docbook wizard.docbook kppp-account-dial-tab.png ttyS-cua.txt Makefile.in kppp-config.png kppp.faq.question kppp-account-gateway-tab.png tricks.docbook hayes.docbook kppp-dialler-tab.png kppp-device-tab.png security.docbook kppp-account-accounting-tab.png Makefile.am costsgraphs.fig kppp-account-execute-tab.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
+- @for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++ @for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++ for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++ for file in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/krdc/Makefile.in
+++ doc/krdc/Makefile.in
@@ -100,6 +100,7 @@
@@ -39930,6 +52030,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -579,10 +588,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png authentication.eps snapshot_nobrowse.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2
++KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
+- @for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++ @for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++ for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++ for file in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/krfb/Makefile.in
+++ doc/krfb/Makefile.in
@@ -100,6 +100,7 @@
@@ -40030,6 +52167,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -579,10 +588,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png configuration_access.png index.docbook personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2
++KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png index.docbook configuration_access.png personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -609,20 +618,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
+- @for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++ @for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++ for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++ for file in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/ksirc/Makefile.in
+++ doc/ksirc/Makefile.in
@@ -100,6 +100,7 @@
@@ -40509,7 +52683,14 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -407,13 +416,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kpf krdc krfb kwifimanager kopete lisa knewsticker kget kppp ktalkd kcontrol ksirc kdict
++SUBDIRS =. kpf kget kppp krdc krfb lisa knewsticker kdict ksirc kwifimanager kcontrol kopete ktalkd
+ #>- all: all-recursive
+ #>+ 1
all: docs-am all-recursive
.SUFFIXES:
@@ -40630,6 +52811,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -879,18 +888,18 @@
+ mocs: kcmsambaconf.moc
+
+ #>+ 3
+-usertabimpl.moc: $(srcdir)/usertabimpl.h
+- $(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
++sambafile.moc: $(srcdir)/sambafile.h
++ $(MOC) $(srcdir)/sambafile.h -o sambafile.moc
+
+ #>+ 2
+-mocs: usertabimpl.moc
++mocs: sambafile.moc
+
+ #>+ 3
+-sambafile.moc: $(srcdir)/sambafile.h
+- $(MOC) $(srcdir)/sambafile.h -o sambafile.moc
++usertabimpl.moc: $(srcdir)/usertabimpl.h
++ $(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
+
+ #>+ 2
+-mocs: sambafile.moc
++mocs: usertabimpl.moc
+
+ #>+ 3
+ hiddenfileview.moc: $(srcdir)/hiddenfileview.h
+@@ -959,10 +968,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kcmsambaconf.moc usertabimpl.moc sambafile.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
++ -rm -f kcmsambaconf.moc sambafile.moc usertabimpl.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
+
+ #>+ 2
+-KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h sambafile.h printerdlgimpl.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui.h share.ui smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt
++KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h printerdlgimpl.h sambafile.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui share.ui.h smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt
+
+ #>+ 13
+ clean-ui:
--- filesharing/advanced/Makefile.in
+++ filesharing/advanced/Makefile.in
@@ -116,6 +116,7 @@
@@ -41330,6 +53549,123 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1051,13 +1060,6 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
+
+ #>+ 3
+-sets.moc: $(srcdir)/sets.h
+- $(MOC) $(srcdir)/sets.h -o sets.moc
+-
+-#>+ 2
+-mocs: sets.moc
+-
+-#>+ 3
+ actions.moc: $(srcdir)/actions.h
+ $(MOC) $(srcdir)/actions.h -o actions.moc
+
+@@ -1065,25 +1067,18 @@
+ mocs: actions.moc
+
+ #>+ 3
+-options.moc: $(srcdir)/options.h
+- $(MOC) $(srcdir)/options.h -o options.moc
+-
+-#>+ 2
+-mocs: options.moc
+-
+-#>+ 3
+-queryview.moc: $(srcdir)/queryview.h
+- $(MOC) $(srcdir)/queryview.h -o queryview.moc
++sets.moc: $(srcdir)/sets.h
++ $(MOC) $(srcdir)/sets.h -o sets.moc
+
+ #>+ 2
+-mocs: queryview.moc
++mocs: sets.moc
+
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++options.moc: $(srcdir)/options.h
++ $(MOC) $(srcdir)/options.h -o options.moc
+
+ #>+ 2
+-mocs: toplevel.moc
++mocs: options.moc
+
+ #>+ 3
+ application.moc: $(srcdir)/application.h
+@@ -1106,6 +1101,20 @@
+ #>+ 2
+ mocs: dict.moc
+
++#>+ 3
++queryview.moc: $(srcdir)/queryview.h
++ $(MOC) $(srcdir)/queryview.h -o queryview.moc
++
++#>+ 2
++mocs: queryview.moc
++
++#>+ 3
++toplevel.moc: $(srcdir)/toplevel.h
++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++
++#>+ 2
++mocs: toplevel.moc
++
+ #>+ 8
+ kdict.la.closure: $(kdict_la_OBJECTS) $(kdict_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > kdict_la_closure.cpp
+@@ -1117,10 +1126,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f sets.moc actions.moc options.moc queryview.moc toplevel.moc application.moc matchview.moc dict.moc
++ -rm -f actions.moc sets.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
+
+ #>+ 2
+-KDE_DIST=kdictui.rc dcopinterface.h hi128-app-kdict.png hisc-app-kdict.svgz hi48-app-kdict.png Makefile.in hi64-app-kdict.png hi16-app-kdict.png hi32-app-kdict.png kdict.desktop Makefile.am LICENSE
++KDE_DIST=kdictui.rc dcopinterface.h hi128-app-kdict.png hisc-app-kdict.svgz hi48-app-kdict.png hi64-app-kdict.png Makefile.in hi16-app-kdict.png hi32-app-kdict.png kdict.desktop Makefile.am LICENSE
+
+ #>+ 4
+ clean-idl:
+@@ -1136,8 +1145,6 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdict.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+@@ -1146,15 +1153,17 @@
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdict.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdict.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdict.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdict.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdict.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdict.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdict.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
+
+ #>+ 15
+@@ -1196,7 +1205,7 @@
+
+
+ #>+ 11
+-libkdeinit_kdict_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp actions.moc sets.moc options.moc toplevel.moc queryview.moc application.moc matchview.moc dict.moc
++libkdeinit_kdict_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp sets.moc actions.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
+ @echo 'creating libkdeinit_kdict_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_kdict_la.all_cpp.files libkdeinit_kdict_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdict_la.all_cpp.final; \
--- kdict/pics/Makefile.in
+++ kdict/pics/Makefile.in
@@ -100,6 +100,7 @@
@@ -41430,6 +53766,29 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,19 +593,19 @@
+
+ #>+ 15
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ $(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
+ $(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-query_erase.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
++ $(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ -rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
+ -rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
+ -rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
++ -rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+
+ #>+ 15
+ force-reedit:
--- kdnssd/ioslave/Makefile.in
+++ kdnssd/ioslave/Makefile.in
@@ -147,6 +147,7 @@
@@ -41530,6 +53889,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -830,7 +839,7 @@
+ -rm -f dnssd.moc
+
+ #>+ 2
+-KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp dnssd.h CONFIG_FORMAT zeroconf.desktop _http._tcp Makefile.in _nfs._tcp invitation.protocol _ldap._tcp _webdav._tcp Makefile.am
++KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp CONFIG_FORMAT dnssd.h zeroconf.desktop _http._tcp Makefile.in _nfs._tcp invitation.protocol _ldap._tcp _webdav._tcp Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kdnssd/kdedmodule/Makefile.in
+++ kdnssd/kdedmodule/Makefile.in
@@ -147,6 +147,7 @@
@@ -42030,6 +54398,105 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,7 +586,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_uselastdir.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png cr22-action-bar5.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-bar0.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-bar3.png cr22-action-kget_dock_download.png Makefile.in cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png
++KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_uselastdir.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png cr22-action-bar5.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-bar0.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-bar3.png cr22-action-kget_dock_download.png Makefile.in cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png
+
+ #>+ 2
+ docs-am:
+@@ -586,59 +595,59 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_on.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_timer.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock_download.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock_download.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar2.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar3.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar4.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar5.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar6.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock_download.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+
+ #>+ 15
+ force-reedit:
--- kget/kget_plug_in/Makefile.in
+++ kget/kget_plug_in/Makefile.in
@@ -145,6 +145,7 @@
@@ -42230,6 +54697,118 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1071,18 +1080,18 @@
+ mocs: dlgAdvanced.moc
+
+ #>+ 3
+-docking.moc: $(srcdir)/docking.h
+- $(MOC) $(srcdir)/docking.h -o docking.moc
++transfer.moc: $(srcdir)/transfer.h
++ $(MOC) $(srcdir)/transfer.h -o transfer.moc
+
+ #>+ 2
+-mocs: docking.moc
++mocs: transfer.moc
+
+ #>+ 3
+-transfer.moc: $(srcdir)/transfer.h
+- $(MOC) $(srcdir)/transfer.h -o transfer.moc
++docking.moc: $(srcdir)/docking.h
++ $(MOC) $(srcdir)/docking.h -o docking.moc
+
+ #>+ 2
+-mocs: transfer.moc
++mocs: docking.moc
+
+ #>+ 3
+ slave.moc: $(srcdir)/slave.h
+@@ -1113,18 +1122,18 @@
+ mocs: dlgSystem.moc
+
+ #>+ 3
+-kmainwidget.moc: $(srcdir)/kmainwidget.h
+- $(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
++dlgConnection.moc: $(srcdir)/dlgConnection.h
++ $(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
+
+ #>+ 2
+-mocs: kmainwidget.moc
++mocs: dlgConnection.moc
+
+ #>+ 3
+-dlgConnection.moc: $(srcdir)/dlgConnection.h
+- $(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
++kmainwidget.moc: $(srcdir)/kmainwidget.h
++ $(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
+
+ #>+ 2
+-mocs: dlgConnection.moc
++mocs: kmainwidget.moc
+
+ #>+ 3
+ droptarget.moc: $(srcdir)/droptarget.h
+@@ -1163,7 +1172,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f dockindividual.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
++ -rm -f dockindividual.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
+
+ #>+ 2
+ KDE_DIST=cr32-mime-kget_list.png dlglimitsbase.ui eventsrc dlgadvancedbase.ui dlgsystembase.ui safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr16-mime-kget_list.png cr48-app-kget.png cr16-app-kget.png kgetui.rc cr22-app-kget.png cr22-mime-kget_list.png kget_download.desktop Makefile.in x-kgetlist.desktop cr32-app-kget.png cr48-mime-kget_list.png Makefile.am kget_iface.h
+@@ -1188,31 +1197,31 @@
+
+ #>+ 28
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kget.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr48-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kget.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr22-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kget.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kget_list.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kget_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kget.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kget.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kget.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kget.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kget_list.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kget_list.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kget_list.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
+
+ #>+ 15
+@@ -1254,7 +1263,7 @@
+
+
+ #>+ 11
+-kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
++kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
+ @echo 'creating kget.all_cpp.cpp ...'; \
+ rm -f kget.all_cpp.files kget.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
--- kget/pics/Makefile.in
+++ kget/pics/Makefile.in
@@ -110,6 +110,7 @@
@@ -42830,6 +55409,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1032,18 +1041,18 @@
+ mocs: newsscroller.moc
+
+ #>+ 3
+-knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
+- $(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
++knewsticker.moc: $(srcdir)/knewsticker.h
++ $(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
+
+ #>+ 2
+-mocs: knewstickerconfig.moc
++mocs: knewsticker.moc
+
+ #>+ 3
+-knewsticker.moc: $(srcdir)/knewsticker.h
+- $(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
++knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
++ $(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
+
+ #>+ 2
+-mocs: knewsticker.moc
++mocs: knewstickerconfig.moc
+
+ #>+ 3
+ newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
+@@ -1054,10 +1063,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f newsscroller.moc knewstickerconfig.moc knewsticker.moc newssourcedlgimpl.moc
++ -rm -f newsscroller.moc knewsticker.moc knewstickerconfig.moc newssourcedlgimpl.moc
+
+ #>+ 2
+-KDE_DIST=knewstickerconfigwidget.ui knewsticker-standalone.desktop eventsrc knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h knewsticker.upd hi16-app-knewsticker.png newssourcedlg.ui Makefile.in hi32-app-knewsticker.png Makefile.am hi48-app-knewsticker.png newssourcedlgimpl.h
++KDE_DIST=knewstickerconfigwidget.ui knewsticker-standalone.desktop eventsrc knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h knewsticker.upd hi16-app-knewsticker.png newssourcedlg.ui Makefile.in hi32-app-knewsticker.png Makefile.am newssourcedlgimpl.h hi48-app-knewsticker.png
+
+ #>+ 4
+ clean-idl:
+@@ -1079,17 +1088,17 @@
+
+ #>+ 13
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knewsticker.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knewsticker.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knewsticker.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knewsticker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knewsticker.png
+
+ #>+ 15
+ force-reedit:
+@@ -1130,7 +1139,7 @@
+
+
+ #>+ 11
+-knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp knewstickerconfigwidget.moc knewsticker.moc knewstickerconfig.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
++knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp knewstickerconfigwidget.moc knewstickerconfig.moc knewsticker.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
+ @echo 'creating knewsticker_panelapplet_la.all_cpp.cpp ...'; \
+ rm -f knewsticker_panelapplet_la.all_cpp.files knewsticker_panelapplet_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
--- kopete/icons/Makefile.in
+++ kopete/icons/Makefile.in
@@ -100,6 +100,7 @@
@@ -42930,6 +55577,196 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,116 +586,116 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-account_offline_overlay.png hi16-action-kopeteaway.png cr16-action-contact_xa_overlay.png cr16-action-contact_busy_overlay.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-metacontact_away.png cr16-action-emoticon.png cr48-action-kopeteavailable.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr16-action-contact_food_overlay.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png cr22-action-kopeteavailable.png hi16-action-newmsg.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi22-action-kopeteavailable.png hi16-action-status_unknown.png hi48-action-kopeteaway.png cr16-action-contact_invisible_overlay.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am hi32-action-kopeteaway.png
++KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-account_offline_overlay.png hi16-action-kopeteaway.png cr16-action-contact_xa_overlay.png cr16-action-contact_busy_overlay.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-metacontact_away.png cr16-action-emoticon.png cr48-action-kopeteavailable.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr16-action-contact_food_overlay.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png hi16-action-newmsg.png cr22-action-kopeteavailable.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi22-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi48-action-kopeteaway.png hi16-action-status_unknown.png cr16-action-contact_invisible_overlay.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am hi32-action-kopeteaway.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 105
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+- $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
++ $(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++ $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_food_overlay.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+
+ #>+ 15
+ force-reedit:
--- kopete/kopete/addaccountwizard/Makefile.in
+++ kopete/kopete/addaccountwizard/Makefile.in
@@ -139,6 +139,7 @@
@@ -43230,6 +56067,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -922,11 +931,11 @@
+ mocs: kopeteemailwindow.moc
+
+ #>+ 3
+-chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
+- $(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
++kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
++ $(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
+
+ #>+ 2
+-mocs: chatmemberslistwidget.moc
++mocs: kopeteemoticonaction.moc
+
+ #>+ 3
+ kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
+@@ -936,11 +945,11 @@
+ mocs: kopetechatwindow.moc
+
+ #>+ 3
+-kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
+- $(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
++chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
++ $(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
+
+ #>+ 2
+-mocs: kopeteemoticonaction.moc
++mocs: chatmemberslistwidget.moc
+
+ #>+ 8
+ kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
+@@ -962,7 +971,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc chatmemberslistwidget.moc kopetechatwindow.moc kopeteemoticonaction.moc
++ -rm -f krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc kopeteemoticonaction.moc kopetechatwindow.moc chatmemberslistwidget.moc
+
+ #>+ 2
+ KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h krichtexteditpart.h chatmessagepart.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc kopeteemailwindow.h Makefile.am
+@@ -1013,7 +1022,7 @@
+
+
+ #>+ 11
+-kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc kopeteemoticonaction.moc chatmemberslistwidget.moc kopetechatwindow.moc
++kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc chatmemberslistwidget.moc kopeteemoticonaction.moc kopetechatwindow.moc
+ @echo 'creating kopete_chatwindow_la.all_cpp.cpp ...'; \
+ rm -f kopete_chatwindow_la.all_cpp.files kopete_chatwindow_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
--- kopete/kopete/config/accounts/Makefile.in
+++ kopete/kopete/config/accounts/Makefile.in
@@ -150,6 +150,7 @@
@@ -43530,6 +56415,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -829,20 +838,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/kopete_avdevice.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/kopete_avdevice.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kopete_avdevice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/kopete_avdevice.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/kopete_avdevice.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/kopete_avdevice.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/kopete_avdevice.png
+
+ #>+ 15
+ force-reedit:
--- kopete/kopete/config/behavior/Makefile.in
+++ kopete/kopete/config/behavior/Makefile.in
@@ -149,6 +149,7 @@
@@ -43630,6 +56542,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -800,7 +809,7 @@
+ -rm -f behaviorconfig.moc
+
+ #>+ 2
+-KDE_DIST=behaviorconfig.h kopeteawayconfigbase.ui kopete_behaviorconfig.desktop Makefile.in behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig_chat.ui Makefile.am
++KDE_DIST=behaviorconfig.h kopeteawayconfigbase.ui kopete_behaviorconfig.desktop Makefile.in behaviorconfig_general.ui behaviorconfig_chat.ui behaviorconfig_events.ui Makefile.am
+
+ #>+ 7
+ clean-ui:
--- kopete/kopete/config/identity/Makefile.in
+++ kopete/kopete/config/identity/Makefile.in
@@ -152,6 +152,7 @@
@@ -43730,6 +56651,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -809,22 +818,22 @@
+
+
+ #>+ 3
+-kopeteidentityconfig.moc: $(srcdir)/kopeteidentityconfig.h
+- $(MOC) $(srcdir)/kopeteidentityconfig.h -o kopeteidentityconfig.moc
++globalidentitiesmanager.moc: $(srcdir)/globalidentitiesmanager.h
++ $(MOC) $(srcdir)/globalidentitiesmanager.h -o globalidentitiesmanager.moc
+
+ #>+ 2
+-mocs: kopeteidentityconfig.moc
++mocs: globalidentitiesmanager.moc
+
+ #>+ 3
+-globalidentitiesmanager.moc: $(srcdir)/globalidentitiesmanager.h
+- $(MOC) $(srcdir)/globalidentitiesmanager.h -o globalidentitiesmanager.moc
++kopeteidentityconfig.moc: $(srcdir)/kopeteidentityconfig.h
++ $(MOC) $(srcdir)/kopeteidentityconfig.h -o kopeteidentityconfig.moc
+
+ #>+ 2
+-mocs: globalidentitiesmanager.moc
++mocs: kopeteidentityconfig.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kopeteidentityconfig.moc globalidentitiesmanager.moc
++ -rm -f globalidentitiesmanager.moc kopeteidentityconfig.moc
+
+ #>+ 2
+ KDE_DIST=globalidentitiesmanager.h kopeteidentityconfigbase.ui kopeteidentityconfigpreferences.kcfgc kopeteidentityconfig.h kopeteidentityconfigpreferences.kcfg Makefile.in kopete_identityconfig.desktop Makefile.am
+@@ -885,7 +894,7 @@
+
+
+ #>+ 11
+-kcm_kopete_identityconfig_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kopeteidentityconfig.cpp $(srcdir)/globalidentitiesmanager.cpp kopeteidentityconfigbase.cpp kopeteidentityconfigpreferences.cpp kopeteidentityconfigbase.moc globalidentitiesmanager.moc kopeteidentityconfig.moc
++kcm_kopete_identityconfig_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kopeteidentityconfig.cpp $(srcdir)/globalidentitiesmanager.cpp kopeteidentityconfigbase.cpp kopeteidentityconfigpreferences.cpp kopeteidentityconfigbase.moc kopeteidentityconfig.moc globalidentitiesmanager.moc
+ @echo 'creating kcm_kopete_identityconfig_la.all_cpp.cpp ...'; \
+ rm -f kcm_kopete_identityconfig_la.all_cpp.files kcm_kopete_identityconfig_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kopete_identityconfig_la.all_cpp.final; \
--- kopete/kopete/config/Makefile.in
+++ kopete/kopete/config/Makefile.in
@@ -116,6 +116,7 @@
@@ -44030,6 +56990,69 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -746,18 +755,18 @@
+ .NOEXPORT:
+
+ #>+ 3
+-customnotificationprops.moc: $(srcdir)/customnotificationprops.h
+- $(MOC) $(srcdir)/customnotificationprops.h -o customnotificationprops.moc
++kopetegrouplistaction.moc: $(srcdir)/kopetegrouplistaction.h
++ $(MOC) $(srcdir)/kopetegrouplistaction.h -o kopetegrouplistaction.moc
+
+ #>+ 2
+-mocs: customnotificationprops.moc
++mocs: kopetegrouplistaction.moc
+
+ #>+ 3
+-kopetegrouplistaction.moc: $(srcdir)/kopetegrouplistaction.h
+- $(MOC) $(srcdir)/kopetegrouplistaction.h -o kopetegrouplistaction.moc
++customnotificationprops.moc: $(srcdir)/customnotificationprops.h
++ $(MOC) $(srcdir)/customnotificationprops.h -o customnotificationprops.moc
+
+ #>+ 2
+-mocs: kopetegrouplistaction.moc
++mocs: customnotificationprops.moc
+
+ #>+ 3
+ kopetelviprops.moc: $(srcdir)/kopetelviprops.h
+@@ -774,18 +783,18 @@
+ mocs: kopetecontactlistview.moc
+
+ #>+ 3
+-kopetemetacontactlvi.moc: $(srcdir)/kopetemetacontactlvi.h
+- $(MOC) $(srcdir)/kopetemetacontactlvi.h -o kopetemetacontactlvi.moc
++kopetegroupviewitem.moc: $(srcdir)/kopetegroupviewitem.h
++ $(MOC) $(srcdir)/kopetegroupviewitem.h -o kopetegroupviewitem.moc
+
+ #>+ 2
+-mocs: kopetemetacontactlvi.moc
++mocs: kopetegroupviewitem.moc
+
+ #>+ 3
+-kopetegroupviewitem.moc: $(srcdir)/kopetegroupviewitem.h
+- $(MOC) $(srcdir)/kopetegroupviewitem.h -o kopetegroupviewitem.moc
++kopetemetacontactlvi.moc: $(srcdir)/kopetemetacontactlvi.h
++ $(MOC) $(srcdir)/kopetemetacontactlvi.h -o kopetemetacontactlvi.moc
+
+ #>+ 2
+-mocs: kopetegroupviewitem.moc
++mocs: kopetemetacontactlvi.moc
+
+ #>+ 3
+ kabcexport.moc: $(srcdir)/kabcexport.h
+@@ -796,10 +805,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f customnotificationprops.moc kopetegrouplistaction.moc kopetelviprops.moc kopetecontactlistview.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc kabcexport.moc
++ -rm -f kopetegrouplistaction.moc customnotificationprops.moc kopetelviprops.moc kopetecontactlistview.moc kopetegroupviewitem.moc kopetemetacontactlvi.moc kabcexport.moc
+
+ #>+ 2
+-KDE_DIST=kopetelviprops.h kopetegrouplistaction.h kopetestatusgroupviewitem.h kopetemetacontactlvi.h kopetegvipropswidget.ui kabcexport_base.ui kopeteaddrbookexportui.ui kopetecontactlistview.h configure.in.in kopetegroupviewitem.h customnotifications.ui Makefile.in kopetemetalvipropswidget.ui Makefile.am
++KDE_DIST=kopetelviprops.h kopetegrouplistaction.h kopetestatusgroupviewitem.h kopetegvipropswidget.ui kopetemetacontactlvi.h kabcexport_base.ui kopeteaddrbookexportui.ui kopetecontactlistview.h configure.in.in kopetegroupviewitem.h customnotifications.ui Makefile.in kopetemetalvipropswidget.ui Makefile.am
+
+ #>+ 8
+ clean-ui:
--- kopete/kopete/kconf_update/Makefile.in
+++ kopete/kopete/kconf_update/Makefile.in
@@ -171,6 +171,7 @@
@@ -44230,6 +57253,118 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1007,18 +1016,18 @@
+ mocs: kopetewindow.moc
+
+ #>+ 3
+-kopeteapplication.moc: $(srcdir)/kopeteapplication.h
+- $(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
++kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
++ $(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
+
+ #>+ 2
+-mocs: kopeteapplication.moc
++mocs: kimifaceimpl.moc
+
+ #>+ 3
+-kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
+- $(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
++kopeteapplication.moc: $(srcdir)/kopeteapplication.h
++ $(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
+
+ #>+ 2
+-mocs: kimifaceimpl.moc
++mocs: kopeteapplication.moc
+
+ #>+ 3
+ kopeteeditglobalidentitywidget.moc: $(srcdir)/kopeteeditglobalidentitywidget.h
+@@ -1043,10 +1052,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
++ -rm -f kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
+
+ #>+ 2
+-KDE_DIST=hi32-app-kopete.png kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png hi22-app-kopete.png eventsrc kimiface.h cr22-app-kopete_all_away.png cr16-mime-kopete_emoticons.png cr22-app-kopete_some_away.png hi48-app-kopete.png cr22-mime-kopete_emoticons.png systemtray.h kopeteapplication.h kopetewindow.h kopeteeditglobalidentitywidget.h kopete.desktop cr22-app-kopete_offline.png hi128-app-kopete.png kopeteiface.h Makefile.in x-kopete-emoticons.desktop hisc-app-kopete2.svgz hi64-app-kopete.png kopeteballoon.h kopeteui.rc hi16-app-kopete.png Makefile.am
++KDE_DIST=hi32-app-kopete.png kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc hi22-app-kopete.png kimiface.h cr22-app-kopete_all_away.png cr16-mime-kopete_emoticons.png cr22-app-kopete_some_away.png cr22-mime-kopete_emoticons.png hi48-app-kopete.png systemtray.h kopeteapplication.h kopetewindow.h kopeteeditglobalidentitywidget.h kopete.desktop cr22-app-kopete_offline.png hi128-app-kopete.png kopeteiface.h x-kopete-emoticons.desktop Makefile.in hisc-app-kopete2.svgz hi64-app-kopete.png kopeteui.rc kopeteballoon.h hi16-app-kopete.png Makefile.am
+
+ #>+ 5
+ clean-idl:
+@@ -1060,43 +1069,43 @@
+ #>+ 40
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kopete.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kopete2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kopete2.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kopete.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kopete.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kopete.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kopete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kopete2.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kopete.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kopete.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kopete.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kopete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kopete.png
+
+ #>+ 15
+ force-reedit:
+@@ -1137,7 +1146,7 @@
+
+
+ #>+ 11
+-kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp $(srcdir)/kopeteeditglobalidentitywidget.cpp kopeteiface_skel.cpp kimiface_skel.cpp kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
++kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp $(srcdir)/kopeteeditglobalidentitywidget.cpp kopeteiface_skel.cpp kimiface_skel.cpp kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc kopeteeditglobalidentitywidget.moc systemtray.moc kopeteaccountstatusbaricon.moc
+ @echo 'creating kopete.all_cpp.cpp ...'; \
+ rm -f kopete.all_cpp.files kopete.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
--- kopete/libkopete/avdevice/Makefile.in
+++ kopete/libkopete/avdevice/Makefile.in
@@ -159,6 +159,7 @@
@@ -44430,6 +57565,99 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1226,18 +1235,18 @@
+ mocs: kopeteaccount.moc
+
+ #>+ 3
+-kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
+- $(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
++kopetecontact.moc: $(srcdir)/kopetecontact.h
++ $(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
+
+ #>+ 2
+-mocs: kopetewalletmanager.moc
++mocs: kopetecontact.moc
+
+ #>+ 3
+-kopetecontact.moc: $(srcdir)/kopetecontact.h
+- $(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
++kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
++ $(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
+
+ #>+ 2
+-mocs: kopetecontact.moc
++mocs: kopetewalletmanager.moc
+
+ #>+ 3
+ kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
+@@ -1254,18 +1263,18 @@
+ mocs: kopetecommandhandler.moc
+
+ #>+ 3
+-kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
+- $(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
++kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
++ $(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
+
+ #>+ 2
+-mocs: kopetepluginmanager.moc
++mocs: kopeteawayaction.moc
+
+ #>+ 3
+-kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
+- $(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
++kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
++ $(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
+
+ #>+ 2
+-mocs: kopeteawayaction.moc
++mocs: kopetepluginmanager.moc
+
+ #>+ 3
+ kautoconfig.moc: $(srcdir)/kautoconfig.h
+@@ -1373,18 +1382,18 @@
+ mocs: kopeteplugin.moc
+
+ #>+ 3
+-kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
+- $(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
++kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
++ $(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
+
+ #>+ 2
+-mocs: kopetesimplemessagehandler.moc
++mocs: kcautoconfigmodule.moc
+
+ #>+ 3
+-kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
+- $(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
++kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
++ $(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
+
+ #>+ 2
+-mocs: kcautoconfigmodule.moc
++mocs: kopetesimplemessagehandler.moc
+
+ #>+ 3
+ kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
+@@ -1451,7 +1460,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kopetexsl.moc kopeteaccount.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetechatsessionmanager.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetechatsession.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc knotification.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemetacontact.moc
++ -rm -f kopetexsl.moc kopeteaccount.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetechatsessionmanager.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetechatsession.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc knotification.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemetacontact.moc
+
+ #>+ 2
+ KDE_DIST=connectionmanager.h PORTING kopetemessagemanagerfactory.h kopetenotifyevent.h API-TODO kopeteconfig.kcfgc kautoconfig.h kopetewalletmanager.h clientiface.h kopetemessagemanager.h kopeteutils.h kopeteui.desktop kopetepluginmanager.h kopete.kcfg kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h knotification.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp
+@@ -1513,7 +1522,7 @@
+
+
+ #>+ 11
+-libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotification.cpp $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetechatsession.cpp $(srcdir)/kopetechatsessionmanager.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp $(srcdir)/kopeteutils.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp kopeteaccount.moc kopetexsl.moc kopetecontact.moc kopetewalletmanager.moc connectionmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopetechatsession.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopeteplugin.moc kopetepluginmanager.moc kopeteawayaction.moc kopetecontactlist.moc kautoconfig.moc knotification.moc kopetetransfermanager.moc kopeteblacklister.moc kopetetask.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetechatsessionmanager.moc kopetemetacontact.moc kopetemessagehandler.moc
++libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotification.cpp $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetechatsession.cpp $(srcdir)/kopetechatsessionmanager.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp $(srcdir)/kopeteutils.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp kopeteaccount.moc kopetexsl.moc kopetewalletmanager.moc kopetecontact.moc connectionmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopetechatsession.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopeteplugin.moc kopeteawayaction.moc kopetepluginmanager.moc kopetecontactlist.moc kautoconfig.moc knotification.moc kopetetransfermanager.moc kopeteblacklister.moc kopetetask.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetechatsessionmanager.moc kopetemetacontact.moc kopetemessagehandler.moc
+ @echo 'creating libkopete_la.all_cpp.cpp ...'; \
+ rm -f libkopete_la.all_cpp.files libkopete_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
--- kopete/libkopete/private/Makefile.in
+++ kopete/libkopete/private/Makefile.in
@@ -136,6 +136,7 @@
@@ -44530,6 +57758,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -752,7 +761,7 @@
+ -rm -f kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc kopeteutils_private.moc
+
+ #>+ 2
+-KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h kopeteutils_private.h Makefile.in Makefile.am kopeteviewmanager.h
++KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h kopeteutils_private.h Makefile.in kopeteviewmanager.h Makefile.am
+
+ #>+ 2
+ docs-am:
--- kopete/libkopete/tests/Makefile.in
+++ kopete/libkopete/tests/Makefile.in
@@ -208,6 +208,7 @@
@@ -44830,6 +58067,40 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -859,18 +868,18 @@
+ mocs: kopetelistviewitem.moc
+
+ #>+ 3
+-kopetelistviewsearchline.moc: $(srcdir)/kopetelistviewsearchline.h
+- $(MOC) $(srcdir)/kopetelistviewsearchline.h -o kopetelistviewsearchline.moc
++metacontactselectorwidget.moc: $(srcdir)/metacontactselectorwidget.h
++ $(MOC) $(srcdir)/metacontactselectorwidget.h -o metacontactselectorwidget.moc
+
+ #>+ 2
+-mocs: kopetelistviewsearchline.moc
++mocs: metacontactselectorwidget.moc
+
+ #>+ 3
+-metacontactselectorwidget.moc: $(srcdir)/metacontactselectorwidget.h
+- $(MOC) $(srcdir)/metacontactselectorwidget.h -o metacontactselectorwidget.moc
++kopetelistviewsearchline.moc: $(srcdir)/kopetelistviewsearchline.h
++ $(MOC) $(srcdir)/kopetelistviewsearchline.h -o kopetelistviewsearchline.moc
+
+ #>+ 2
+-mocs: metacontactselectorwidget.moc
++mocs: kopetelistviewsearchline.moc
+
+ #>+ 3
+ addressbookselectorwidget.moc: $(srcdir)/addressbookselectorwidget.h
+@@ -895,7 +904,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f userinfodialog.moc addressbookselectordialog.moc contactaddednotifydialog.moc kopetelistview.moc kopetecontactaction.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc kopetelistviewitem.moc kopetelistviewsearchline.moc metacontactselectorwidget.moc addressbookselectorwidget.moc kopetefileconfirmdialog.moc accountselector.moc
++ -rm -f userinfodialog.moc addressbookselectordialog.moc contactaddednotifydialog.moc kopetelistview.moc kopetecontactaction.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc kopetelistviewitem.moc metacontactselectorwidget.moc kopetelistviewsearchline.moc addressbookselectorwidget.moc kopetefileconfirmdialog.moc accountselector.moc
+
+ #>+ 2
+ KDE_DIST=contactaddednotifywidget.ui kopetewidgets.cpp fileconfirmbase.ui kopete.widgets addressbookselectorwidget_base.ui metacontactselectorwidget.h contactaddednotifydialog.h widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui metacontactselectorwidget_base.ui Makefile.in kopetepassworddialog.ui Makefile.am
--- kopete/Makefile.in
+++ kopete/Makefile.in
@@ -118,6 +118,7 @@
@@ -45130,6 +58401,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -820,18 +829,18 @@
+
+
+ #>+ 3
+-aliasplugin.moc: $(srcdir)/aliasplugin.h
+- $(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
++aliaspreferences.moc: $(srcdir)/aliaspreferences.h
++ $(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
+
+ #>+ 2
+-mocs: aliasplugin.moc
++mocs: aliaspreferences.moc
+
+ #>+ 3
+-aliaspreferences.moc: $(srcdir)/aliaspreferences.h
+- $(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
++aliasplugin.moc: $(srcdir)/aliasplugin.h
++ $(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
+
+ #>+ 2
+-mocs: aliaspreferences.moc
++mocs: aliasplugin.moc
+
+ #>+ 3
+ editaliasdialog.moc: $(srcdir)/editaliasdialog.h
+@@ -851,10 +860,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f aliasplugin.moc aliaspreferences.moc editaliasdialog.moc
++ -rm -f aliaspreferences.moc aliasplugin.moc editaliasdialog.moc
+
+ #>+ 2
+-KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop Makefile.in aliasdialog.ui aliasdialogbase.ui Makefile.am
++KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop aliasdialog.ui Makefile.in aliasdialogbase.ui Makefile.am
+
+ #>+ 5
+ clean-ui:
+@@ -945,8 +954,8 @@
+
+ #>+ 11
+ nmcheck:
+-aliaspreferences.o: aliaspreferences.moc
+ aliasplugin.o: aliasplugin.moc
++aliaspreferences.o: aliaspreferences.moc
+ $(srcdir)/editaliasdialog.cpp: aliasdialogbase.h aliasdialog.h
+ nmcheck-am: nmcheck
+ aliasplugin.lo: aliasplugin.moc
--- kopete/plugins/autoreplace/icons/Makefile.in
+++ kopete/plugins/autoreplace/icons/Makefile.in
@@ -100,6 +100,7 @@
@@ -45730,6 +59049,67 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -977,6 +986,13 @@
+
+
+ #>+ 3
++cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
++ $(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
++
++#>+ 2
++mocs: cryptographyguiclient.moc
++
++#>+ 3
+ kgpginterface.moc: $(srcdir)/kgpginterface.h
+ $(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
+
+@@ -984,11 +1000,11 @@
+ mocs: kgpginterface.moc
+
+ #>+ 3
+-cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
+- $(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
++cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
++ $(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
+
+ #>+ 2
+-mocs: cryptographyguiclient.moc
++mocs: cryptographyselectuserkey.moc
+
+ #>+ 3
+ kgpgselkey.moc: $(srcdir)/kgpgselkey.h
+@@ -1005,13 +1021,6 @@
+ mocs: popuppublic.moc
+
+ #>+ 3
+-cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
+- $(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
+-
+-#>+ 2
+-mocs: cryptographyselectuserkey.moc
+-
+-#>+ 3
+ cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
+ $(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
+
+@@ -1036,7 +1045,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kgpginterface.moc cryptographyguiclient.moc kgpgselkey.moc popuppublic.moc cryptographyselectuserkey.moc cryptographypreferences.moc cryptographyplugin.moc
++ -rm -f cryptographyguiclient.moc kgpginterface.moc cryptographyselectuserkey.moc kgpgselkey.moc popuppublic.moc cryptographypreferences.moc cryptographyplugin.moc
+
+ #>+ 2
+ KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h
+@@ -1105,7 +1114,7 @@
+ rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
+
+ #>+ 11
+-kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp cryptographyguiclient.moc kgpginterface.moc cryptographyuserkey_ui.moc cryptographyselectuserkey.moc popuppublic.moc kgpgselkey.moc cryptographyplugin.moc
++kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp kgpginterface.moc cryptographyguiclient.moc cryptographyuserkey_ui.moc popuppublic.moc kgpgselkey.moc cryptographyselectuserkey.moc cryptographyplugin.moc
+ @echo 'creating kopete_cryptography_la.all_cpp.cpp ...'; \
+ rm -f kopete_cryptography_la.all_cpp.files kopete_cryptography_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
--- kopete/plugins/highlight/icons/Makefile.in
+++ kopete/plugins/highlight/icons/Makefile.in
@@ -100,6 +100,7 @@
@@ -45930,6 +59310,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -975,7 +984,7 @@
+ -rm -f highlightpreferences.moc highlightplugin.moc
+
+ #>+ 2
+-KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightprefsbase.ui highlightplugin.h highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop
++KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightplugin.h highlightprefsbase.ui highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop
+
+ #>+ 4
+ clean-ui:
--- kopete/plugins/history/Makefile.in
+++ kopete/plugins/history/Makefile.in
@@ -163,6 +163,7 @@
@@ -46030,6 +59419,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -877,18 +886,18 @@
+
+
+ #>+ 3
+-historyplugin.moc: $(srcdir)/historyplugin.h
+- $(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
++historyguiclient.moc: $(srcdir)/historyguiclient.h
++ $(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
+
+ #>+ 2
+-mocs: historyplugin.moc
++mocs: historyguiclient.moc
+
+ #>+ 3
+-historyguiclient.moc: $(srcdir)/historyguiclient.h
+- $(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
++historyplugin.moc: $(srcdir)/historyplugin.h
++ $(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
+
+ #>+ 2
+-mocs: historyguiclient.moc
++mocs: historyplugin.moc
+
+ #>+ 3
+ historylogger.moc: $(srcdir)/historylogger.h
+@@ -922,7 +931,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f historyplugin.moc historyguiclient.moc historylogger.moc historypreferences.moc historydialog.moc
++ -rm -f historyguiclient.moc historyplugin.moc historylogger.moc historypreferences.moc historydialog.moc
+
+ #>+ 2
+ KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h
+@@ -997,7 +1006,7 @@
+ rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
+
+ #>+ 11
+-kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp historyguiclient.moc historyplugin.moc historylogger.moc historyviewer.moc historydialog.moc
++kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp historyplugin.moc historyguiclient.moc historylogger.moc historyviewer.moc historydialog.moc
+ @echo 'creating kopete_history_la.all_cpp.cpp ...'; \
+ rm -f kopete_history_la.all_cpp.files kopete_history_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
--- kopete/plugins/latex/icons/Makefile.in
+++ kopete/plugins/latex/icons/Makefile.in
@@ -100,6 +100,7 @@
@@ -46430,6 +59862,40 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -843,18 +852,18 @@
+
+
+ #>+ 3
+-motionawayplugin.moc: $(srcdir)/motionawayplugin.h
+- $(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
++motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
++ $(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
+
+ #>+ 2
+-mocs: motionawayplugin.moc
++mocs: motionawaypreferences.moc
+
+ #>+ 3
+-motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
+- $(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
++motionawayplugin.moc: $(srcdir)/motionawayplugin.h
++ $(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
+
+ #>+ 2
+-mocs: motionawaypreferences.moc
++mocs: motionawayplugin.moc
+
+ #>+ 8
+ kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
+@@ -867,7 +876,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f motionawayplugin.moc motionawaypreferences.moc
++ -rm -f motionawaypreferences.moc motionawayplugin.moc
+
+ #>+ 2
+ KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am
--- kopete/plugins/netmeeting/Makefile.in
+++ kopete/plugins/netmeeting/Makefile.in
@@ -164,6 +164,7 @@
@@ -46530,6 +59996,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -891,7 +900,7 @@
+ -rm -f netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
+
+ #>+ 2
+-KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h Makefile.am netmeetingprefs_ui.ui
++KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h netmeetingprefs_ui.ui Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kopete/plugins/nowlistening/Makefile.in
+++ kopete/plugins/nowlistening/Makefile.in
@@ -73,8 +73,7 @@
@@ -46651,6 +60126,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -890,18 +898,18 @@
+ mocs: nowlisteningpreferences.moc
+
+ #>+ 3
+-nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
+- $(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
++nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
++ $(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
+
+ #>+ 2
+-mocs: nowlisteningguiclient.moc
++mocs: nowlisteningplugin.moc
+
+ #>+ 3
+-nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
+- $(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
++nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
++ $(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
+
+ #>+ 2
+-mocs: nowlisteningplugin.moc
++mocs: nowlisteningguiclient.moc
+
+ #>+ 8
+ kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
+@@ -914,7 +922,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f nowlisteningpreferences.moc nowlisteningguiclient.moc nowlisteningplugin.moc
++ -rm -f nowlisteningpreferences.moc nowlisteningplugin.moc nowlisteningguiclient.moc
+
+ #>+ 2
+ KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nlnoatun.h nowlisteningconfig.kcfg kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningconfig.kcfgc nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h
+@@ -988,7 +996,7 @@
+ rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
+
+ #>+ 11
+-kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp nowlisteningconfig.cpp nowlisteningplugin.moc nowlisteningguiclient.moc
++kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp nowlisteningconfig.cpp nowlisteningguiclient.moc nowlisteningplugin.moc
+ @echo 'creating kopete_nowlistening_la.all_cpp.cpp ...'; \
+ rm -f kopete_nowlistening_la.all_cpp.files kopete_nowlistening_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
--- kopete/plugins/smpppdcs/config/Makefile.in
+++ kopete/plugins/smpppdcs/config/Makefile.in
@@ -151,6 +151,7 @@
@@ -47551,6 +61069,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -890,7 +899,7 @@
+ -rm -f translatorplugin.moc translatorguiclient.moc translatordialog.moc
+
+ #>+ 2
+-KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorplugin.h translatorui.rc translatorguiclient.h Makefile.am
++KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorui.rc translatorplugin.h translatorguiclient.h Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kopete/plugins/webpresence/Makefile.in
+++ kopete/plugins/webpresence/Makefile.in
@@ -158,6 +158,7 @@
@@ -47751,6 +61278,77 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,7 +586,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-gg_busy_d.png cr16-action-gg_invi_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_description_overlay.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-app-gadu_protocol.png cr16-action-gg_away.png cr16-action-gg_online_d.png Makefile.am
++KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_description_overlay.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-action-gg_away.png cr16-app-gadu_protocol.png cr16-action-gg_online_d.png Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -585,40 +594,40 @@
+ #>+ 37
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_description_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_connecting.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_description_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_description_overlay.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/gadu/libgadu/Makefile.in
+++ kopete/protocols/gadu/libgadu/Makefile.in
@@ -127,6 +127,7 @@
@@ -47951,6 +61549,93 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -997,11 +1006,11 @@
+ mocs: gaducommands.moc
+
+ #>+ 3
+-gadupubdir.moc: $(srcdir)/gadupubdir.h
+- $(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
++gadueditcontact.moc: $(srcdir)/gadueditcontact.h
++ $(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
+
+ #>+ 2
+-mocs: gadupubdir.moc
++mocs: gadueditcontact.moc
+
+ #>+ 3
+ gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
+@@ -1011,11 +1020,11 @@
+ mocs: gaduregisteraccount.moc
+
+ #>+ 3
+-gadueditcontact.moc: $(srcdir)/gadueditcontact.h
+- $(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
++gadupubdir.moc: $(srcdir)/gadupubdir.h
++ $(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
+
+ #>+ 2
+-mocs: gadueditcontact.moc
++mocs: gadupubdir.moc
+
+ #>+ 3
+ gaduaway.moc: $(srcdir)/gaduaway.h
+@@ -1032,25 +1041,25 @@
+ mocs: gaduprotocol.moc
+
+ #>+ 3
+-gaducontact.moc: $(srcdir)/gaducontact.h
+- $(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
++gadueditaccount.moc: $(srcdir)/gadueditaccount.h
++ $(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
+
+ #>+ 2
+-mocs: gaducontact.moc
++mocs: gadueditaccount.moc
+
+ #>+ 3
+-gadueditaccount.moc: $(srcdir)/gadueditaccount.h
+- $(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
++gaducontact.moc: $(srcdir)/gaducontact.h
++ $(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
+
+ #>+ 2
+-mocs: gadueditaccount.moc
++mocs: gaducontact.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
++ -rm -f gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
+
+ #>+ 2
+-KDE_DIST=README.gadu gaduaddcontactpage.h gadurichtextformat.h gadueditcontact.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am
++KDE_DIST=README.gadu gaduaddcontactpage.h gadueditcontact.h gadurichtextformat.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1098,7 +1107,7 @@
+
+
+ #>+ 11
+-kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
++kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
+ @echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
+ rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
+@@ -1149,11 +1158,11 @@
+ gadupubdir.o: gadupubdir.moc
+ gadueditaccount.lo: gadueditaccount.moc
+ gadudccserver.lo: gadudccserver.moc
+-gadueditcontact.lo: gadueditcontact.moc
+ gadueditcontact.o: gadueditcontact.moc
++gadueditcontact.lo: gadueditcontact.moc
+ gaducontact.o: gaducontact.moc
+-gaduaccount.o: gaduaccount.moc
+ gadupubdir.lo: gadupubdir.moc
++gaduaccount.o: gaduaccount.moc
+ gaduaway.lo: gaduaway.moc
+ gaducommands.lo: gaducommands.moc
+ gaduaddcontactpage.o: gaduaddcontactpage.moc
--- kopete/protocols/gadu/ui/Makefile.in
+++ kopete/protocols/gadu/ui/Makefile.in
@@ -133,6 +133,7 @@
@@ -48151,6 +61836,89 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,7 +586,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr16-action-groupwise_busy.png cr64-app-groupwise_protocol.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png
++KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr64-app-groupwise_protocol.png cr16-action-groupwise_busy.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png
+
+ #>+ 2
+ docs-am:
+@@ -585,47 +594,47 @@
+ #>+ 44
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions
+ $(INSTALL_DATA) $(srcdir)/cr64-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/groupwise/libgroupwise/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/Makefile.in
@@ -174,6 +174,7 @@
@@ -48251,6 +62019,65 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -945,18 +954,18 @@
+
+
+ #>+ 3
+-responseprotocol.moc: $(srcdir)/responseprotocol.h
+- $(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
++userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
++ $(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
+
+ #>+ 2
+-mocs: responseprotocol.moc
++mocs: userdetailsmanager.moc
+
+ #>+ 3
+-userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
+- $(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
++responseprotocol.moc: $(srcdir)/responseprotocol.h
++ $(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
+
+ #>+ 2
+-mocs: userdetailsmanager.moc
++mocs: responseprotocol.moc
+
+ #>+ 3
+ stream.moc: $(srcdir)/stream.h
+@@ -966,18 +975,18 @@
+ mocs: stream.moc
+
+ #>+ 3
+-task.moc: $(srcdir)/task.h
+- $(MOC) $(srcdir)/task.h -o task.moc
++tlshandler.moc: $(srcdir)/tlshandler.h
++ $(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
+
+ #>+ 2
+-mocs: task.moc
++mocs: tlshandler.moc
+
+ #>+ 3
+-tlshandler.moc: $(srcdir)/tlshandler.h
+- $(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
++task.moc: $(srcdir)/task.h
++ $(MOC) $(srcdir)/task.h -o task.moc
+
+ #>+ 2
+-mocs: tlshandler.moc
++mocs: task.moc
+
+ #>+ 3
+ qcatlshandler.moc: $(srcdir)/qcatlshandler.h
+@@ -1067,7 +1076,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f responseprotocol.moc userdetailsmanager.moc stream.moc task.moc tlshandler.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
++ -rm -f userdetailsmanager.moc responseprotocol.moc stream.moc tlshandler.moc task.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
+
+ #>+ 2
+ KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am
--- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
@@ -117,6 +117,7 @@
@@ -48551,6 +62378,101 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -850,13 +859,6 @@
+ mocs: connectiontask.moc
+
+ #>+ 3
+-updateitemtask.moc: $(srcdir)/updateitemtask.h
+- $(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
+-
+-#>+ 2
+-mocs: updateitemtask.moc
+-
+-#>+ 3
+ logintask.moc: $(srcdir)/logintask.h
+ $(MOC) $(srcdir)/logintask.h -o logintask.moc
+
+@@ -871,6 +873,13 @@
+ mocs: createcontactinstancetask.moc
+
+ #>+ 3
++updateitemtask.moc: $(srcdir)/updateitemtask.h
++ $(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
++
++#>+ 2
++mocs: updateitemtask.moc
++
++#>+ 3
+ rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
+ $(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
+
+@@ -892,18 +901,18 @@
+ mocs: getdetailstask.moc
+
+ #>+ 3
+-searchtask.moc: $(srcdir)/searchtask.h
+- $(MOC) $(srcdir)/searchtask.h -o searchtask.moc
++privacyitemtask.moc: $(srcdir)/privacyitemtask.h
++ $(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
+
+ #>+ 2
+-mocs: searchtask.moc
++mocs: privacyitemtask.moc
+
+ #>+ 3
+-privacyitemtask.moc: $(srcdir)/privacyitemtask.h
+- $(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
++searchtask.moc: $(srcdir)/searchtask.h
++ $(MOC) $(srcdir)/searchtask.h -o searchtask.moc
+
+ #>+ 2
+-mocs: privacyitemtask.moc
++mocs: searchtask.moc
+
+ #>+ 3
+ joinconferencetask.moc: $(srcdir)/joinconferencetask.h
+@@ -984,10 +993,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc logintask.moc createcontactinstancetask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
++ -rm -f deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc logintask.moc createcontactinstancetask.moc updateitemtask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
+
+ #>+ 2
+-KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in Makefile.am gwtasklogin.h
++KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in gwtasklogin.h Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1035,7 +1044,7 @@
+
+
+ #>+ 11
+-libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc createcontactinstancetask.moc logintask.moc updateitemtask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
++libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc createcontactinstancetask.moc logintask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
+ @echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
+ rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
+@@ -1108,8 +1117,8 @@
+ conferencetask.lo: conferencetask.moc
+ createcontacttask.o: createcontacttask.moc
+ logintask.lo: logintask.moc
+-createcontactinstancetask.lo: createcontactinstancetask.moc
+ searchtask.lo: searchtask.moc
++createcontactinstancetask.lo: createcontactinstancetask.moc
+ updatecontacttask.lo: updatecontacttask.moc
+ setstatustask.lo: setstatustask.moc
+ logintask.o: logintask.moc
+@@ -1122,8 +1131,8 @@
+ typingtask.lo: typingtask.moc
+ requesttask.o: requesttask.moc
+ updateitemtask.lo: updateitemtask.moc
+-privacyitemtask.lo: privacyitemtask.moc
+ rejectinvitetask.lo: rejectinvitetask.moc
++privacyitemtask.lo: privacyitemtask.moc
+ joinconferencetask.lo: joinconferencetask.moc
+ statustask.o: statustask.moc
+ typingtask.o: typingtask.moc
--- kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
@@ -131,6 +131,7 @@
@@ -48851,6 +62773,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -946,18 +955,18 @@
+
+
+ #>+ 3
+-gwprotocol.moc: $(srcdir)/gwprotocol.h
+- $(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
++gwaccount.moc: $(srcdir)/gwaccount.h
++ $(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
+
+ #>+ 2
+-mocs: gwprotocol.moc
++mocs: gwaccount.moc
+
+ #>+ 3
+-gwaccount.moc: $(srcdir)/gwaccount.h
+- $(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
++gwprotocol.moc: $(srcdir)/gwprotocol.h
++ $(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
+
+ #>+ 2
+-mocs: gwaccount.moc
++mocs: gwprotocol.moc
+
+ #>+ 3
+ gwbytestream.moc: $(srcdir)/gwbytestream.h
+@@ -974,18 +983,18 @@
+ mocs: gwconnector.moc
+
+ #>+ 3
+-gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
+- $(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
++gwcontact.moc: $(srcdir)/gwcontact.h
++ $(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
+
+ #>+ 2
+-mocs: gwmessagemanager.moc
++mocs: gwcontact.moc
+
+ #>+ 3
+-gwcontact.moc: $(srcdir)/gwcontact.h
+- $(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
++gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
++ $(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
+
+ #>+ 2
+-mocs: gwcontact.moc
++mocs: gwmessagemanager.moc
+
+ #>+ 3
+ gwcontactlist.moc: $(srcdir)/gwcontactlist.h
+@@ -996,7 +1005,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
++ -rm -f gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
+
+ #>+ 2
+ KDE_DIST=DESIGN gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am
+@@ -1047,7 +1056,7 @@
+
+
+ #>+ 11
+-kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
++kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
+ @echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
+ rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
+@@ -1088,8 +1097,8 @@
+ gwbytestream.o: gwbytestream.moc
+ gwconnector.o: gwconnector.moc
+ gwaccount.lo: gwaccount.moc
+-gwprotocol.o: gwprotocol.moc
+ gwmessagemanager.o: gwmessagemanager.moc
++gwprotocol.o: gwprotocol.moc
+ gwbytestream.lo: gwbytestream.moc
+ nmcheck:
+ gwcontact.o: gwcontact.moc
--- kopete/protocols/groupwise/ui/Makefile.in
+++ kopete/protocols/groupwise/ui/Makefile.in
@@ -141,6 +141,7 @@
@@ -49051,6 +63051,51 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,31 +593,31 @@
+
+ #>+ 27
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_normal.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/irc/libkirc/Makefile.in
+++ kopete/protocols/irc/libkirc/Makefile.in
@@ -137,6 +137,7 @@
@@ -49151,6 +63196,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -770,36 +779,36 @@
+ mocs: kirctransferserver.moc
+
+ #>+ 3
+-kircengine.moc: $(srcdir)/kircengine.h
+- $(MOC) $(srcdir)/kircengine.h -o kircengine.moc
++kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
++ $(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
+
+ #>+ 2
+-mocs: kircengine.moc
++mocs: kirctransferhandler.moc
+
+ #>+ 3
+-kircmessage.moc: $(srcdir)/kircmessage.h
+- $(MOC) $(srcdir)/kircmessage.h -o kircmessage.moc
++kircengine.moc: $(srcdir)/kircengine.h
++ $(MOC) $(srcdir)/kircengine.h -o kircengine.moc
+
+ #>+ 2
+-mocs: kircmessage.moc
++mocs: kircengine.moc
+
+ #>+ 3
+-kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
+- $(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
++ksslsocket.moc: $(srcdir)/ksslsocket.h
++ $(MOC) $(srcdir)/ksslsocket.h -o ksslsocket.moc
+
+ #>+ 2
+-mocs: kirctransferhandler.moc
++mocs: ksslsocket.moc
+
+ #>+ 3
+-ksslsocket.moc: $(srcdir)/ksslsocket.h
+- $(MOC) $(srcdir)/ksslsocket.h -o ksslsocket.moc
++kircmessage.moc: $(srcdir)/kircmessage.h
++ $(MOC) $(srcdir)/kircmessage.h -o kircmessage.moc
+
+ #>+ 2
+-mocs: ksslsocket.moc
++mocs: kircmessage.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kircengine.moc kircmessage.moc kirctransferhandler.moc ksslsocket.moc
++ -rm -f kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kirctransferhandler.moc kircengine.moc ksslsocket.moc kircmessage.moc
+
+ #>+ 2
+ KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am
--- kopete/protocols/irc/Makefile.in
+++ kopete/protocols/irc/Makefile.in
@@ -173,6 +173,7 @@
@@ -49251,6 +63346,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -990,18 +999,18 @@
+ mocs: ircchannelcontact.moc
+
+ #>+ 3
+-irccontactmanager.moc: $(srcdir)/irccontactmanager.h
+- $(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
++ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
++ $(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
+
+ #>+ 2
+-mocs: irccontactmanager.moc
++mocs: ircsignalhandler.moc
+
+ #>+ 3
+-ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
+- $(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
++irccontactmanager.moc: $(srcdir)/irccontactmanager.h
++ $(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
+
+ #>+ 2
+-mocs: ircsignalhandler.moc
++mocs: irccontactmanager.moc
+
+ #>+ 3
+ ircguiclient.moc: $(srcdir)/ircguiclient.h
+@@ -1018,18 +1027,18 @@
+ mocs: irccontact.moc
+
+ #>+ 3
+-ircservercontact.moc: $(srcdir)/ircservercontact.h
+- $(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
++kcodecaction.moc: $(srcdir)/kcodecaction.h
++ $(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
+
+ #>+ 2
+-mocs: ircservercontact.moc
++mocs: kcodecaction.moc
+
+ #>+ 3
+-kcodecaction.moc: $(srcdir)/kcodecaction.h
+- $(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
++ircservercontact.moc: $(srcdir)/ircservercontact.h
++ $(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
+
+ #>+ 2
+-mocs: kcodecaction.moc
++mocs: ircservercontact.moc
+
+ #>+ 3
+ ircusercontact.moc: $(srcdir)/ircusercontact.h
+@@ -1068,7 +1077,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc ircguiclient.moc irccontact.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
++ -rm -f ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc ircguiclient.moc irccontact.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
+
+ #>+ 2
+ KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h
+@@ -1119,7 +1128,7 @@
+
+
+ #>+ 11
+-kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc irccontact.moc ircguiclient.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
++kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc irccontact.moc ircguiclient.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
+ @echo 'creating kopete_irc_la.all_cpp.cpp ...'; \
+ rm -f kopete_irc_la.all_cpp.files kopete_irc_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
--- kopete/protocols/irc/ui/Makefile.in
+++ kopete/protocols/irc/ui/Makefile.in
@@ -135,6 +135,7 @@
@@ -49451,6 +63614,150 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,87 +586,87 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_online.png hi16-action-jabber_xa.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png Makefile.am hi16-action-jabber_serv_off.png cr32-app-jabber_protocol.png
++KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_xa.png hi16-action-jabber_online.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png hi16-action-jabber_serv_off.png Makefile.am cr32-app-jabber_protocol.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 76
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/jabber/kioslave/Makefile.in
+++ kopete/protocols/jabber/kioslave/Makefile.in
@@ -154,6 +154,7 @@
@@ -49751,6 +64058,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -728,18 +737,18 @@
+ mocs: ndns.moc
+
+ #>+ 3
+-socks.moc: $(srcdir)/socks.h
+- $(MOC) $(srcdir)/socks.h -o socks.moc
++httpconnect.moc: $(srcdir)/httpconnect.h
++ $(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
+
+ #>+ 2
+-mocs: socks.moc
++mocs: httpconnect.moc
+
+ #>+ 3
+-httpconnect.moc: $(srcdir)/httpconnect.h
+- $(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
++socks.moc: $(srcdir)/socks.h
++ $(MOC) $(srcdir)/socks.h -o socks.moc
+
+ #>+ 2
+-mocs: httpconnect.moc
++mocs: socks.moc
+
+ #>+ 3
+ httppoll.moc: $(srcdir)/httppoll.h
+@@ -764,10 +773,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f srvresolver.moc ndns.moc socks.moc httpconnect.moc httppoll.moc servsock.moc bsocket.moc
++ -rm -f srvresolver.moc ndns.moc httpconnect.moc socks.moc httppoll.moc servsock.moc bsocket.moc
+
+ #>+ 2
+-KDE_DIST=bsocket.h ndns.h httppoll.h httpconnect.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am
++KDE_DIST=bsocket.h ndns.h httpconnect.h httppoll.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
--- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
@@ -135,6 +135,7 @@
@@ -50751,6 +65096,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1054,18 +1063,18 @@
+ mocs: jabbergroupchatmanager.moc
+
+ #>+ 3
+-jabbercontact.moc: $(srcdir)/jabbercontact.h
+- $(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
++jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
++ $(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
+
+ #>+ 2
+-mocs: jabbercontact.moc
++mocs: jabberformtranslator.moc
+
+ #>+ 3
+-jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
+- $(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
++jabbercontact.moc: $(srcdir)/jabbercontact.h
++ $(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
+
+ #>+ 2
+-mocs: jabberformtranslator.moc
++mocs: jabbercontact.moc
+
+ #>+ 3
+ jabberprotocol.moc: $(srcdir)/jabberprotocol.h
+@@ -1118,7 +1127,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
++ -rm -f jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
+
+ #>+ 2
+ KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h
+@@ -1169,7 +1178,7 @@
+
+
+ #>+ 11
+-kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbergroupmembercontact.moc
++kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbergroupmembercontact.moc
+ @echo 'creating kopete_jabber_la.all_cpp.cpp ...'; \
+ rm -f kopete_jabber_la.all_cpp.files kopete_jabber_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
--- kopete/protocols/jabber/ui/Makefile.in
+++ kopete/protocols/jabber/ui/Makefile.in
@@ -141,6 +141,7 @@
@@ -50851,6 +65239,73 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -783,13 +792,6 @@
+ mocs: dlgjabbervcard.moc
+
+ #>+ 3
+-dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
+- $(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
+-
+-#>+ 2
+-mocs: dlgjabberbrowse.moc
+-
+-#>+ 3
+ dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
+ $(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
+
+@@ -804,6 +806,13 @@
+ mocs: dlgjabberchangepassword.moc
+
+ #>+ 3
++dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
++ $(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
++
++#>+ 2
++mocs: dlgjabberbrowse.moc
++
++#>+ 3
+ dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
+ $(MOC) $(srcdir)/dlgjabberchatjoin.h -o dlgjabberchatjoin.moc
+
+@@ -825,22 +834,22 @@
+ mocs: dlgjabberservices.moc
+
+ #>+ 3
+-dlgjabbersendraw.moc: $(srcdir)/dlgjabbersendraw.h
+- $(MOC) $(srcdir)/dlgjabbersendraw.h -o dlgjabbersendraw.moc
++jabberchooseserver.moc: $(srcdir)/jabberchooseserver.h
++ $(MOC) $(srcdir)/jabberchooseserver.h -o jabberchooseserver.moc
+
+ #>+ 2
+-mocs: dlgjabbersendraw.moc
++mocs: jabberchooseserver.moc
+
+ #>+ 3
+-jabberchooseserver.moc: $(srcdir)/jabberchooseserver.h
+- $(MOC) $(srcdir)/jabberchooseserver.h -o jabberchooseserver.moc
++dlgjabbersendraw.moc: $(srcdir)/dlgjabbersendraw.h
++ $(MOC) $(srcdir)/dlgjabbersendraw.h -o dlgjabbersendraw.moc
+
+ #>+ 2
+-mocs: jabberchooseserver.moc
++mocs: dlgjabbersendraw.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgjabberchangepassword.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc dlgjabbersendraw.moc jabberchooseserver.moc
++ -rm -f jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberregister.moc dlgjabberchangepassword.moc dlgjabberbrowse.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
+
+ #>+ 2
+ KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgchangepassword.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberchangepassword.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h
+@@ -902,7 +911,7 @@
+
+
+ #>+ 11
+-libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberchangepassword.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc dlgchangepassword.moc
++libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberbrowse.moc dlgjabberchangepassword.moc dlgjabberregister.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc dlgchangepassword.moc
+ @echo 'creating libkopetejabberui_la.all_cpp.cpp ...'; \
+ rm -f libkopetejabberui_la.all_cpp.files libkopetejabberui_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
--- kopete/protocols/Makefile.in
+++ kopete/protocols/Makefile.in
@@ -117,6 +117,7 @@
@@ -51051,6 +65506,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -586,36 +595,36 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/meanwhile/Makefile.in
+++ kopete/protocols/meanwhile/Makefile.in
@@ -64,18 +64,17 @@
@@ -51582,6 +66087,83 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -585,47 +594,47 @@
+ #>+ 44
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_brb.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-msn_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/msn/Makefile.in
+++ kopete/protocols/msn/Makefile.in
@@ -188,6 +188,7 @@
@@ -51682,6 +66264,81 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1070,18 +1079,18 @@
+ mocs: msndebugrawcmddlg.moc
+
+ #>+ 3
+-msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
+- $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
++msncontact.moc: $(srcdir)/msncontact.h
++ $(MOC) $(srcdir)/msncontact.h -o msncontact.moc
+
+ #>+ 2
+-mocs: msnfiletransfersocket.moc
++mocs: msncontact.moc
+
+ #>+ 3
+-msncontact.moc: $(srcdir)/msncontact.h
+- $(MOC) $(srcdir)/msncontact.h -o msncontact.moc
++msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
++ $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
+
+ #>+ 2
+-mocs: msncontact.moc
++mocs: msnfiletransfersocket.moc
+
+ #>+ 3
+ msnprotocol.moc: $(srcdir)/msnprotocol.h
+@@ -1133,11 +1142,11 @@
+ mocs: p2p.moc
+
+ #>+ 3
+-webcam.moc: $(srcdir)/webcam.h
+- $(MOC) $(srcdir)/webcam.h -o webcam.moc
++dispatcher.moc: $(srcdir)/dispatcher.h
++ $(MOC) $(srcdir)/dispatcher.h -o dispatcher.moc
+
+ #>+ 2
+-mocs: webcam.moc
++mocs: dispatcher.moc
+
+ #>+ 3
+ messageformatter.moc: $(srcdir)/messageformatter.h
+@@ -1147,11 +1156,11 @@
+ mocs: messageformatter.moc
+
+ #>+ 3
+-dispatcher.moc: $(srcdir)/dispatcher.h
+- $(MOC) $(srcdir)/dispatcher.h -o dispatcher.moc
++webcam.moc: $(srcdir)/webcam.h
++ $(MOC) $(srcdir)/webcam.h -o webcam.moc
+
+ #>+ 2
+-mocs: dispatcher.moc
++mocs: webcam.moc
+
+ #>+ 8
+ libkopete_msn_shared.la.closure: $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_DEPENDENCIES)
+@@ -1164,7 +1173,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f msnsecureloginhandler.moc incomingtransfer.moc msnchallengehandler.moc msnswitchboardsocket.moc msnaddcontactpage.moc msndebugrawcmddlg.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnchatsession.moc msnaccount.moc outgoingtransfer.moc msnsocket.moc msnnotifysocket.moc p2p.moc webcam.moc messageformatter.moc dispatcher.moc
++ -rm -f msnsecureloginhandler.moc incomingtransfer.moc msnchallengehandler.moc msnswitchboardsocket.moc msnaddcontactpage.moc msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnprotocol.moc msnchatsession.moc msnaccount.moc outgoingtransfer.moc msnsocket.moc msnnotifysocket.moc p2p.moc dispatcher.moc messageformatter.moc webcam.moc
+
+ #>+ 2
+ KDE_DIST=kopete_msn.desktop msncontact.h msnchatui.rc Changelog msnsocket.h msnsecureloginhandler.h ReleaseNotes msnchallengehandler.h msnchatsession.h msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
+@@ -1256,9 +1265,9 @@
+ msnsecureloginhandler.lo: msnsecureloginhandler.moc
+ msnfiletransfersocket.o: msnfiletransfersocket.moc
+ outgoingtransfer.lo: outgoingtransfer.moc
++webcam.lo: webcam.moc
+ msndebugrawcmddlg.o: msndebugrawcmddlg.moc
+ p2p.lo: p2p.moc
+-webcam.lo: webcam.moc
+ dispatcher.lo: dispatcher.moc
+ msnchallengehandler.o: msnchallengehandler.moc
+ msnsocket.lo: msnsocket.moc
--- kopete/protocols/msn/ui/Makefile.in
+++ kopete/protocols/msn/ui/Makefile.in
@@ -133,6 +133,7 @@
@@ -51982,6 +66639,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -850,7 +859,7 @@
+ -rm -f msnwebcamdialog.moc
+
+ #>+ 2
+-KDE_DIST=msnwebcamdialog.h Makefile.in Makefile.am mimicwrapper.h
++KDE_DIST=msnwebcamdialog.h Makefile.in mimicwrapper.h Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kopete/protocols/oscar/aim/Makefile.in
+++ kopete/protocols/oscar/aim/Makefile.in
@@ -163,6 +163,7 @@
@@ -52082,6 +66748,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -929,22 +938,22 @@
+ mocs: aimaccount.moc
+
+ #>+ 3
+-aimprotocol.moc: $(srcdir)/aimprotocol.h
+- $(MOC) $(srcdir)/aimprotocol.h -o aimprotocol.moc
++aimjoinchat.moc: $(srcdir)/aimjoinchat.h
++ $(MOC) $(srcdir)/aimjoinchat.h -o aimjoinchat.moc
+
+ #>+ 2
+-mocs: aimprotocol.moc
++mocs: aimjoinchat.moc
+
+ #>+ 3
+-aimjoinchat.moc: $(srcdir)/aimjoinchat.h
+- $(MOC) $(srcdir)/aimjoinchat.h -o aimjoinchat.moc
++aimprotocol.moc: $(srcdir)/aimprotocol.h
++ $(MOC) $(srcdir)/aimprotocol.h -o aimprotocol.moc
+
+ #>+ 2
+-mocs: aimjoinchat.moc
++mocs: aimprotocol.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc
++ -rm -f aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc
+
+ #>+ 2
+ KDE_DIST=aimuserinfo.h kopete_aim.desktop aim.protocol aimcontact.h aimaccount.h Makefile.in aimjoinchat.h Makefile.am aimprotocol.h
+@@ -995,7 +1004,7 @@
+
+
+ #>+ 11
+-kopete_aim_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/aimprotocol.cpp $(srcdir)/aimaccount.cpp $(srcdir)/aimcontact.cpp $(srcdir)/aimuserinfo.cpp $(srcdir)/aimjoinchat.cpp aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc
++kopete_aim_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/aimprotocol.cpp $(srcdir)/aimaccount.cpp $(srcdir)/aimcontact.cpp $(srcdir)/aimuserinfo.cpp $(srcdir)/aimjoinchat.cpp aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc
+ @echo 'creating kopete_aim_la.all_cpp.cpp ...'; \
+ rm -f kopete_aim_la.all_cpp.files kopete_aim_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_aim_la.all_cpp.final; \
+@@ -1033,9 +1042,9 @@
+ #>+ 13
+ aimcontact.o: aimcontact.moc
+ aimjoinchat.o: aimjoinchat.moc
+-aimjoinchat.lo: aimjoinchat.moc
+ aimcontact.lo: aimcontact.moc
+ aimaccount.lo: aimaccount.moc
++aimjoinchat.lo: aimjoinchat.moc
+ nmcheck:
+ aimprotocol.lo: aimprotocol.moc
+ aimuserinfo.o: aimuserinfo.moc
--- kopete/protocols/oscar/aim/ui/Makefile.in
+++ kopete/protocols/oscar/aim/ui/Makefile.in
@@ -136,6 +136,7 @@
@@ -52282,6 +66998,177 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,7 +586,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-aim_online.png hi16-action-icq_away.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr16-action-aim_away.png cr128-app-aim_protocol.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr48-app-aim_protocol.png cr32-app-icq_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png Makefile.in cr48-app-icq_protocol.png hi16-action-icq_offline.png cr16-action-icq_na.png cr16-action-icq_dnd.png hi16-action-icq_na.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png
++KDE_DIST=hi16-action-icq_away.png cr16-action-aim_online.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr128-app-aim_protocol.png cr16-action-aim_away.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr32-app-icq_protocol.png cr48-app-aim_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png cr48-app-icq_protocol.png Makefile.in hi16-action-icq_offline.png cr16-action-icq_na.png hi16-action-icq_na.png cr16-action-icq_dnd.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png
+
+ #>+ 2
+ docs-am:
+@@ -585,96 +594,96 @@
+ #>+ 93
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ $(INSTALL_DATA) $(srcdir)/hi32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/oscar/icq/Makefile.in
+++ kopete/protocols/oscar/icq/Makefile.in
@@ -164,6 +164,7 @@
@@ -52482,6 +67369,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -771,7 +780,7 @@
+ -rm -f icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
+
+ #>+ 2
+-KDE_DIST=icqadd.ui icqinterestinfowidget.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqsearchbase.ui icqgeneralinfo.ui Makefile.am
++KDE_DIST=icqadd.ui icqaddcontactpage.h icqinterestinfowidget.ui icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqgeneralinfo.ui icqsearchbase.ui Makefile.am
+
+ #>+ 11
+ clean-ui:
--- kopete/protocols/oscar/liboscar/Makefile.in
+++ kopete/protocols/oscar/liboscar/Makefile.in
@@ -182,6 +182,7 @@
@@ -52582,6 +67478,106 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -914,18 +923,18 @@
+ mocs: servicesetuptask.moc
+
+ #>+ 3
+-ssimanager.moc: $(srcdir)/ssimanager.h
+- $(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
++flapprotocol.moc: $(srcdir)/flapprotocol.h
++ $(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
+
+ #>+ 2
+-mocs: ssimanager.moc
++mocs: flapprotocol.moc
+
+ #>+ 3
+-flapprotocol.moc: $(srcdir)/flapprotocol.h
+- $(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
++ssimanager.moc: $(srcdir)/ssimanager.h
++ $(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
+
+ #>+ 2
+-mocs: flapprotocol.moc
++mocs: ssimanager.moc
+
+ #>+ 3
+ bytestream.moc: $(srcdir)/bytestream.h
+@@ -984,13 +993,6 @@
+ mocs: rateclass.moc
+
+ #>+ 3
+-ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
+- $(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
+-
+-#>+ 2
+-mocs: ownuserinfotask.moc
+-
+-#>+ 3
+ snacprotocol.moc: $(srcdir)/snacprotocol.h
+ $(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
+
+@@ -1005,6 +1007,13 @@
+ mocs: rateinfotask.moc
+
+ #>+ 3
++ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
++ $(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
++
++#>+ 2
++mocs: ownuserinfotask.moc
++
++#>+ 3
+ safedelete.moc: $(srcdir)/safedelete.h
+ $(MOC) $(srcdir)/safedelete.h -o safedelete.moc
+
+@@ -1026,18 +1035,18 @@
+ mocs: userinfotask.moc
+
+ #>+ 3
+-ssilisttask.moc: $(srcdir)/ssilisttask.h
+- $(MOC) $(srcdir)/ssilisttask.h -o ssilisttask.moc
++connection.moc: $(srcdir)/connection.h
++ $(MOC) $(srcdir)/connection.h -o connection.moc
+
+ #>+ 2
+-mocs: ssilisttask.moc
++mocs: connection.moc
+
+ #>+ 3
+-connection.moc: $(srcdir)/connection.h
+- $(MOC) $(srcdir)/connection.h -o connection.moc
++ssilisttask.moc: $(srcdir)/ssilisttask.h
++ $(MOC) $(srcdir)/ssilisttask.h -o ssilisttask.moc
+
+ #>+ 2
+-mocs: connection.moc
++mocs: ssilisttask.moc
+
+ #>+ 3
+ warningtask.moc: $(srcdir)/warningtask.h
+@@ -1153,10 +1162,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc snacprotocol.moc rateinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc ssilisttask.moc connection.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc buddyicontask.moc
++ -rm -f oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc buddyicontask.moc
+
+ #>+ 2
+-KDE_DIST=sendidletimetask.h ssiauthtask.h ssilisttask.h errortask.h coreprotocol.h typingnotifytask.h ownuserinfotask.h icqlogintask.h userdetails.h clientreadytask.h icquserinfo.h locationrightstask.h rtf2html.h ssimodifytask.h rateinfotask.h rateclassmanager.h blmlimitstask.h changevisibilitytask.h safedelete.h icqtask.h oscarutils.h ssiparamstask.h sendmessagetask.h rtf.ll DESIGN oscartypes.h bytestream.h oscartypeclasses.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h localcontactlisttask.h transfer.h flapprotocol.h oscarsettings.h ssiactivatetask.h Makefile.in serverredirecttask.h md5.h connector.h snacprotocol.h servicesetuptask.h usersearchtask.h buffer.h connection.h warningtask.h HACKING chatservicetask.h icquserinfotask.h senddcinfotask.h stream.h oscarclientstream.h logintask.h buddyicontask.h task.h oscarmessage.h oscarbytestream.h oscardebug.h connectionhandler.h closeconnectiontask.h profiletask.h chatnavservicetask.h offlinemessagestask.h serverversionstask.h messagereceivertask.h onlinenotifiertask.h inputprotocolbase.h ssimanager.h userinfotask.h Makefile.am
++KDE_DIST=sendidletimetask.h ssiauthtask.h ssilisttask.h errortask.h coreprotocol.h typingnotifytask.h ownuserinfotask.h icqlogintask.h userdetails.h clientreadytask.h icquserinfo.h locationrightstask.h rtf2html.h ssimodifytask.h rateinfotask.h blmlimitstask.h rateclassmanager.h changevisibilitytask.h safedelete.h icqtask.h oscarutils.h ssiparamstask.h sendmessagetask.h rtf.ll DESIGN bytestream.h oscartypes.h oscartypeclasses.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h localcontactlisttask.h prmparamstask.h transfer.h flapprotocol.h oscarsettings.h ssiactivatetask.h Makefile.in serverredirecttask.h md5.h connector.h snacprotocol.h servicesetuptask.h usersearchtask.h buffer.h connection.h warningtask.h HACKING chatservicetask.h icquserinfotask.h senddcinfotask.h stream.h oscarclientstream.h logintask.h buddyicontask.h task.h oscarmessage.h oscarbytestream.h oscardebug.h connectionhandler.h closeconnectiontask.h profiletask.h chatnavservicetask.h offlinemessagestask.h serverversionstask.h messagereceivertask.h onlinenotifiertask.h inputprotocolbase.h ssimanager.h userinfotask.h Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1204,7 +1213,7 @@
+
+
+ #>+ 11
+-liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/oscarmessage.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/buddyicontask.cpp $(srcdir)/serverredirecttask.cpp $(srcdir)/oscarsettings.cpp $(srcdir)/localcontactlisttask.cpp $(srcdir)/chatnavservicetask.cpp $(srcdir)/connectionhandler.cpp $(srcdir)/chatservicetask.cpp oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc rateinfotask.moc ownuserinfotask.moc snacprotocol.moc safedelete.moc userinfotask.moc icqlogintask.moc ssilisttask.moc connection.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc buddyicontask.moc
++liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/oscarmessage.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/buddyicontask.cpp $(srcdir)/serverredirecttask.cpp $(srcdir)/oscarsettings.cpp $(srcdir)/localcontactlisttask.cpp $(srcdir)/chatnavservicetask.cpp $(srcdir)/connectionhandler.cpp $(srcdir)/chatservicetask.cpp oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc snacprotocol.moc rateinfotask.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc connector.moc chatservicetask.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc buddyicontask.moc
+ @echo 'creating liboscar_la.all_cpp.cpp ...'; \
+ rm -f liboscar_la.all_cpp.files liboscar_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
--- kopete/protocols/oscar/liboscar/tests/Makefile.in
+++ kopete/protocols/oscar/liboscar/tests/Makefile.in
@@ -179,6 +179,7 @@
@@ -52682,6 +67678,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -787,13 +796,6 @@
+ .NOEXPORT:
+
+ #>+ 3
+-ssigrouptest.moc: $(srcdir)/ssigrouptest.h
+- $(MOC) $(srcdir)/ssigrouptest.h -o ssigrouptest.moc
+-
+-#>+ 2
+-mocs: ssigrouptest.moc
+-
+-#>+ 3
+ logintest.moc: $(srcdir)/logintest.h
+ $(MOC) $(srcdir)/logintest.h -o logintest.moc
+
+@@ -801,11 +803,11 @@
+ mocs: logintest.moc
+
+ #>+ 3
+-ssitest.moc: $(srcdir)/ssitest.h
+- $(MOC) $(srcdir)/ssitest.h -o ssitest.moc
++ssigrouptest.moc: $(srcdir)/ssigrouptest.h
++ $(MOC) $(srcdir)/ssigrouptest.h -o ssigrouptest.moc
+
+ #>+ 2
+-mocs: ssitest.moc
++mocs: ssigrouptest.moc
+
+ #>+ 3
+ userinfotest.moc: $(srcdir)/userinfotest.h
+@@ -815,6 +817,13 @@
+ mocs: userinfotest.moc
+
+ #>+ 3
++ssitest.moc: $(srcdir)/ssitest.h
++ $(MOC) $(srcdir)/ssitest.h -o ssitest.moc
++
++#>+ 2
++mocs: ssitest.moc
++
++#>+ 3
+ kunittest.moc: $(srcdir)/kunittest.h
+ $(MOC) $(srcdir)/kunittest.h -o kunittest.moc
+
+@@ -830,7 +839,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ssigrouptest.moc logintest.moc ssitest.moc userinfotest.moc kunittest.moc clientstream_test.moc
++ -rm -f logintest.moc ssigrouptest.moc userinfotest.moc ssitest.moc kunittest.moc clientstream_test.moc
+
+ #>+ 2
+ KDE_DIST=ssitest.h chatnavtests.h clientstream_test.h redirecttest.h logintest.h ssigrouptest.h Makefile.in kunittest.h tester.h ipaddrtest.h ssitest.cpp userinfotest.h Makefile.am
--- kopete/protocols/oscar/Makefile.in
+++ kopete/protocols/oscar/Makefile.in
@@ -162,6 +162,7 @@
@@ -52882,6 +67930,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -586,21 +595,21 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/sms/Makefile.in
+++ kopete/protocols/sms/Makefile.in
@@ -166,6 +166,7 @@
@@ -52982,6 +68058,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -947,11 +956,11 @@
+ mocs: smsaddcontactpage.moc
+
+ #>+ 3
+-smsservice.moc: $(srcdir)/smsservice.h
+- $(MOC) $(srcdir)/smsservice.h -o smsservice.moc
++smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
++ $(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
+
+ #>+ 2
+-mocs: smsservice.moc
++mocs: smseditaccountwidget.moc
+
+ #>+ 3
+ smscontact.moc: $(srcdir)/smscontact.h
+@@ -961,15 +970,15 @@
+ mocs: smscontact.moc
+
+ #>+ 3
+-smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
+- $(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
++smsservice.moc: $(srcdir)/smsservice.h
++ $(MOC) $(srcdir)/smsservice.h -o smsservice.moc
+
+ #>+ 2
+-mocs: smseditaccountwidget.moc
++mocs: smsservice.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smsservice.moc smscontact.moc smseditaccountwidget.moc
++ -rm -f smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smseditaccountwidget.moc smscontact.moc smsservice.moc
+
+ #>+ 2
+ KDE_DIST=smscontact.h smsaddcontactpage.h serviceloader.h Makefile.in smsuserpreferences.h smsprotocol.h smsservice.h smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am
+@@ -1020,7 +1029,7 @@
+
+
+ #>+ 11
+-kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp smsaccount.moc smsuserpreferences.moc smsprotocol.moc smseditaccountwidget.moc smscontact.moc smsservice.moc smsaddcontactpage.moc
++kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsservice.moc smscontact.moc smseditaccountwidget.moc smsaddcontactpage.moc
+ @echo 'creating kopete_sms_la.all_cpp.cpp ...'; \
+ rm -f kopete_sms_la.all_cpp.files kopete_sms_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
--- kopete/protocols/sms/services/Makefile.in
+++ kopete/protocols/sms/services/Makefile.in
@@ -136,6 +136,7 @@
@@ -53282,6 +68402,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,23 +593,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/testbed/Makefile.in
+++ kopete/protocols/testbed/Makefile.in
@@ -170,6 +170,7 @@
@@ -53382,6 +68535,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -927,18 +936,18 @@
+ mocs: testbedprotocol.moc
+
+ #>+ 3
+-testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
+- $(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
++testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
++ $(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
+
+ #>+ 2
+-mocs: testbedfakeserver.moc
++mocs: testbedaddcontactpage.moc
+
+ #>+ 3
+-testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
+- $(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
++testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
++ $(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
+
+ #>+ 2
+-mocs: testbedaddcontactpage.moc
++mocs: testbedfakeserver.moc
+
+ #>+ 3
+ testbedaccount.moc: $(srcdir)/testbedaccount.h
+@@ -963,7 +972,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f testbededitaccountwidget.moc testbedprotocol.moc testbedfakeserver.moc testbedaddcontactpage.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
++ -rm -f testbededitaccountwidget.moc testbedprotocol.moc testbedaddcontactpage.moc testbedfakeserver.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
+
+ #>+ 2
+ KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am
+@@ -1059,8 +1068,8 @@
+ testbedcontact.lo: testbedcontact.moc
+ $(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h
+ testbedcontact.o: testbedcontact.moc
+-testbedaddcontactpage.lo: testbedaddcontactpage.moc
+ testbedfakeserver.o: testbedfakeserver.moc
++testbedaddcontactpage.lo: testbedaddcontactpage.moc
+ testbededitaccountwidget.lo: testbededitaccountwidget.moc
+ nmcheck:
+ testbedaccount.lo: testbedaccount.moc
--- kopete/protocols/winpopup/config/Makefile.in
+++ kopete/protocols/winpopup/config/Makefile.in
@@ -147,6 +147,7 @@
@@ -53582,6 +68779,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,26 +593,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-wp_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/winpopup/libwinpopup/Makefile.in
+++ kopete/protocols/winpopup/libwinpopup/Makefile.in
@@ -130,6 +130,7 @@
@@ -53782,6 +69012,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -952,13 +961,6 @@
+ mocs: wpaccount.moc
+
+ #>+ 3
+-wpcontact.moc: $(srcdir)/wpcontact.h
+- $(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
+-
+-#>+ 2
+-mocs: wpcontact.moc
+-
+-#>+ 3
+ wpuserinfo.moc: $(srcdir)/wpuserinfo.h
+ $(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
+
+@@ -966,11 +968,11 @@
+ mocs: wpuserinfo.moc
+
+ #>+ 3
+-wpaddcontact.moc: $(srcdir)/wpaddcontact.h
+- $(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
++wpcontact.moc: $(srcdir)/wpcontact.h
++ $(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
+
+ #>+ 2
+-mocs: wpaddcontact.moc
++mocs: wpcontact.moc
+
+ #>+ 3
+ wpprotocol.moc: $(srcdir)/wpprotocol.h
+@@ -980,8 +982,15 @@
+ mocs: wpprotocol.moc
+
+ #>+ 3
++wpaddcontact.moc: $(srcdir)/wpaddcontact.h
++ $(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
++
++#>+ 2
++mocs: wpaddcontact.moc
++
++#>+ 3
+ clean-metasources:
+- -rm -f wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
++ -rm -f wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
+
+ #>+ 2
+ KDE_DIST=kopete_wp.desktop Makefile.in winpopup-send.sh winpopup-install.sh Makefile.am
+@@ -1032,7 +1041,7 @@
+
+
+ #>+ 11
+-kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
++kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
+ @echo 'creating kopete_wp_la.all_cpp.cpp ...'; \
+ rm -f kopete_wp_la.all_cpp.files kopete_wp_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
--- kopete/protocols/winpopup/ui/Makefile.in
+++ kopete/protocols/winpopup/ui/Makefile.in
@@ -133,6 +133,7 @@
@@ -53982,6 +69267,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -585,37 +594,37 @@
+ #>+ 34
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
+ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
+ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+
+ #>+ 15
+ force-reedit:
--- kopete/protocols/yahoo/libyahoo2/Makefile.in
+++ kopete/protocols/yahoo/libyahoo2/Makefile.in
@@ -131,6 +131,7 @@
@@ -54182,6 +69519,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -964,13 +973,6 @@
+ mocs: yahoouserinfo.moc
+
+ #>+ 3
+-yahoobuddyiconloader.moc: $(srcdir)/yahoobuddyiconloader.h
+- $(MOC) $(srcdir)/yahoobuddyiconloader.h -o yahoobuddyiconloader.moc
+-
+-#>+ 2
+-mocs: yahoobuddyiconloader.moc
+-
+-#>+ 3
+ yahoocontact.moc: $(srcdir)/yahoocontact.h
+ $(MOC) $(srcdir)/yahoocontact.h -o yahoocontact.moc
+
+@@ -985,6 +987,13 @@
+ mocs: kyahoo.moc
+
+ #>+ 3
++yahoobuddyiconloader.moc: $(srcdir)/yahoobuddyiconloader.h
++ $(MOC) $(srcdir)/yahoobuddyiconloader.h -o yahoobuddyiconloader.moc
++
++#>+ 2
++mocs: yahoobuddyiconloader.moc
++
++#>+ 3
+ yahooeditaccount.moc: $(srcdir)/yahooeditaccount.h
+ $(MOC) $(srcdir)/yahooeditaccount.h -o yahooeditaccount.moc
+
+@@ -1021,7 +1030,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f yahooconferencemessagemanager.moc yahoouserinfo.moc yahoobuddyiconloader.moc yahoocontact.moc kyahoo.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
++ -rm -f yahooconferencemessagemanager.moc yahoouserinfo.moc yahoocontact.moc kyahoo.moc yahoobuddyiconloader.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
+
+ #>+ 2
+ KDE_DIST=yahoochatui.rc yahooprotocol.h yahoocontact.h yahooeditaccount.h Makefile.in kyahoo.h yahooconferencemessagemanager.h yahooaccount.h yahooaddcontact.h kopete_yahoo.desktop Makefile.am
+@@ -1072,7 +1081,7 @@
+
+
+ #>+ 11
+-kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoouserinfo.cpp $(srcdir)/yahoobuddyiconloader.cpp $(srcdir)/yahoochatsession.cpp yahooconferencemessagemanager.moc yahoouserinfo.moc kyahoo.moc yahoocontact.moc yahoobuddyiconloader.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
++kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoouserinfo.cpp $(srcdir)/yahoobuddyiconloader.cpp $(srcdir)/yahoochatsession.cpp yahooconferencemessagemanager.moc yahoouserinfo.moc yahoobuddyiconloader.moc kyahoo.moc yahoocontact.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
+ @echo 'creating kopete_yahoo_la.all_cpp.cpp ...'; \
+ rm -f kopete_yahoo_la.all_cpp.files kopete_yahoo_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
--- kopete/protocols/yahoo/ui/Makefile.in
+++ kopete/protocols/yahoo/ui/Makefile.in
@@ -136,6 +136,7 @@
@@ -59882,6 +75265,30 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -805,17 +814,17 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+
+ #>+ 15
+ force-reedit:
--- kpf/src/Makefile.in
+++ kpf/src/Makefile.in
@@ -173,6 +173,7 @@
@@ -59982,6 +75389,179 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -942,13 +951,6 @@
+
+
+ #>+ 3
+-PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
+- $(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
+-
+-#>+ 2
+-mocs: PropertiesDialogPlugin.moc
+-
+-#>+ 3
+ Server.moc: $(srcdir)/Server.h
+ $(MOC) $(srcdir)/Server.h -o Server.moc
+
+@@ -977,81 +979,88 @@
+ mocs: Applet.moc
+
+ #>+ 3
+-WebServer.moc: $(srcdir)/WebServer.h
+- $(MOC) $(srcdir)/WebServer.h -o WebServer.moc
++ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
++ $(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
+
+ #>+ 2
+-mocs: WebServer.moc
++mocs: ActiveMonitorWindow.moc
+
+ #>+ 3
+-ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
+- $(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
++WebServerSocket.moc: $(srcdir)/WebServerSocket.h
++ $(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
+
+ #>+ 2
+-mocs: ActiveMonitorWindow.moc
++mocs: WebServerSocket.moc
+
+ #>+ 3
+-ServerWizard.moc: $(srcdir)/ServerWizard.h
+- $(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
++StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
++ $(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
+
+ #>+ 2
+-mocs: ServerWizard.moc
++mocs: StartingKPFDialog.moc
+
+ #>+ 3
+-WebServerSocket.moc: $(srcdir)/WebServerSocket.h
+- $(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
++ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
++ $(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
+
+ #>+ 2
+-mocs: WebServerSocket.moc
++mocs: ConfigDialogPage.moc
+
+ #>+ 3
+-SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
+- $(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
++BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
++ $(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
+
+ #>+ 2
+-mocs: SingleServerConfigDialog.moc
++mocs: BandwidthGraph.moc
+
+ #>+ 3
+-StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
+- $(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
++WebServerManager.moc: $(srcdir)/WebServerManager.h
++ $(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
+
+ #>+ 2
+-mocs: StartingKPFDialog.moc
++mocs: WebServerManager.moc
+
+ #>+ 3
+-AppletItem.moc: $(srcdir)/AppletItem.h
+- $(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
++PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
++ $(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
+
+ #>+ 2
+-mocs: AppletItem.moc
++mocs: PropertiesDialogPlugin.moc
+
+ #>+ 3
+-DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
+- $(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
++WebServer.moc: $(srcdir)/WebServer.h
++ $(MOC) $(srcdir)/WebServer.h -o WebServer.moc
+
+ #>+ 2
+-mocs: DirSelectWidget.moc
++mocs: WebServer.moc
+
+ #>+ 3
+-ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
+- $(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
++ServerWizard.moc: $(srcdir)/ServerWizard.h
++ $(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
+
+ #>+ 2
+-mocs: ConfigDialogPage.moc
++mocs: ServerWizard.moc
+
+ #>+ 3
+-BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
+- $(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
++SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
++ $(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
+
+ #>+ 2
+-mocs: BandwidthGraph.moc
++mocs: SingleServerConfigDialog.moc
+
+ #>+ 3
+-WebServerManager.moc: $(srcdir)/WebServerManager.h
+- $(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
++AppletItem.moc: $(srcdir)/AppletItem.h
++ $(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
+
+ #>+ 2
+-mocs: WebServerManager.moc
++mocs: AppletItem.moc
++
++#>+ 3
++DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
++ $(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
++
++#>+ 2
++mocs: DirSelectWidget.moc
+
+ #>+ 3
+ WebServerManager_stub.h: WebServerManager.kidl
+@@ -1068,7 +1077,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f PropertiesDialogPlugin.moc Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc WebServer.moc ActiveMonitorWindow.moc ServerWizard.moc WebServerSocket.moc SingleServerConfigDialog.moc StartingKPFDialog.moc AppletItem.moc DirSelectWidget.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc
++ -rm -f Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc StartingKPFDialog.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc PropertiesDialogPlugin.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
+
+ #>+ 2
+ KDE_DIST=KPFInterface.h System.h Makefile.in Defines.h KPFInterface.cpp Makefile.am
+@@ -1128,7 +1137,7 @@
+
+
+ #>+ 11
+-kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc WebServerSocket.moc AppletItem.moc ConfigDialogPage.moc DirSelectWidget.moc BandwidthGraph.moc WebServerManager.moc
++kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
+ @echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
+ rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
+@@ -1140,7 +1149,7 @@
+ rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
+
+ #>+ 11
+-kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp PropertiesDialogPlugin.moc StartingKPFDialog.moc
++kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp StartingKPFDialog.moc PropertiesDialogPlugin.moc
+ @echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
+ rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
+@@ -1184,8 +1193,8 @@
+ $(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h
+ ActiveMonitor.o: ActiveMonitor.moc
+ SingleServerConfigDialog.lo: SingleServerConfigDialog.moc
+-BandwidthGraph.lo: BandwidthGraph.moc
+ WebServer.o: WebServer.moc
++BandwidthGraph.lo: BandwidthGraph.moc
+ nmcheck-am: nmcheck
+ BandwidthGraph.o: BandwidthGraph.moc
+ $(srcdir)/PortValidator.cpp: WebServer_stub.h
--- kppp/DB/Makefile.in
+++ kppp/DB/Makefile.in
@@ -116,6 +116,7 @@
@@ -60382,6 +75962,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -618,7 +627,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=HP-NET AICOM Econnect ARsystem Falco_computer Nextra ProfiNet Contactel Fortech Makefile.in Video_OnLine INTERNEXT CITYNET SeverNET M-soft Brailcom ASYS IQNET Volny INTERNET_OnLine BohemiaNet KPNQuest ApexNet Makefile.am ES-servis
++KDE_DIST=HP-NET AICOM Econnect ARsystem Falco_computer Nextra ProfiNet Contactel Fortech Makefile.in Video_OnLine INTERNEXT CITYNET SeverNET M-soft Brailcom ASYS IQNET Volny INTERNET_OnLine BohemiaNet KPNQuest ApexNet ES-servis Makefile.am
+
+ #>+ 2
+ docs-am:
--- kppp/DB/Provider/Denmark/Makefile.in
+++ kppp/DB/Provider/Denmark/Makefile.in
@@ -110,6 +110,7 @@
@@ -60982,6 +76571,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -666,7 +675,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Euronet%032anytime Euronet%032professional IAE Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Zon%032Inclusief Kabelfoon Freeler%032compleet UwNet Hacom Betuwenet%032BQuality Demon%032Internet Popin FlakkeeNet Solcon ILimburg Daxis%032Internet Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus Support%032Net Macom Interbox Betuwenet%032BFree Zon%032Gratis Interstroom Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Nederland.net Freeler%032basis Via%032Networks 12Move Cistron KeyAcces%032met%0323%032cijferig%032kengetal XS4All Zon%0322 Wannadoo%032budget Bart InterNLnet Plant%032Acces Internet%032Online Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet HCC%032NET HetNet%032Basis%032Surfen Tiscali%032Gratis Dataweb Telebyte HetNet%032Frequent%032Surfen Makefile.am Energis-Ision IntroWeb%032met%0323-cijferig%032kengetal
++KDE_DIST=Euronet%032anytime Euronet%032professional IAE Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Zon%032Inclusief Kabelfoon Freeler%032compleet UwNet Hacom Betuwenet%032BQuality Demon%032Internet Popin FlakkeeNet Solcon ILimburg Daxis%032Internet Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus Support%032Net Macom Interbox Betuwenet%032BFree Zon%032Gratis Interstroom Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Nederland.net Freeler%032basis Via%032Networks 12Move Cistron KeyAcces%032met%0323%032cijferig%032kengetal Zon%0322 XS4All Wannadoo%032budget Bart InterNLnet Plant%032Acces Internet%032Online Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet HCC%032NET HetNet%032Basis%032Surfen Tiscali%032Gratis Dataweb Telebyte HetNet%032Frequent%032Surfen Makefile.am IntroWeb%032met%0323-cijferig%032kengetal Energis-Ision
+
+ #>+ 2
+ docs-am:
--- kppp/DB/Provider/New_Zealand/Makefile.in
+++ kppp/DB/Provider/New_Zealand/Makefile.in
@@ -110,6 +110,7 @@
@@ -61082,6 +76680,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -604,7 +613,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=ihug Makefile.in Voyager Paradise XTRA OrconInternet Makefile.am
++KDE_DIST=ihug Makefile.in Voyager Paradise OrconInternet XTRA Makefile.am
+
+ #>+ 2
+ docs-am:
--- kppp/DB/Provider/Norway/Makefile.in
+++ kppp/DB/Provider/Norway/Makefile.in
@@ -110,6 +110,7 @@
@@ -61982,6 +77589,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -613,7 +622,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=CG.Budva.yu EUnetPristina CG.Bar.yu EUnetS CG.Berane.yu YUBCnet CG.Cetinje.yu EUnetNoviSad CG.Kotor.yu EUnetBeograd CG.Niksic.yu VeratNet PTT Makefile.in EUnetSombor 041Net Sezampro CG.Pljevlja.yu EUnetNis TippNet CG.BijeloPolje.CG.yu CG.Podgorica.yu CG.yu DrenikNet SuOnline BeoTelNet CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full EUnetKragujevac CG.Tivat.yu CG.HercegNovi.yu SCnet EUnetSubotica Makefile.am EUnetCacak
++KDE_DIST=CG.Budva.yu EUnetPristina CG.Bar.yu EUnetS CG.Berane.yu YUBCnet CG.Cetinje.yu EUnetNoviSad CG.Kotor.yu EUnetBeograd VeratNet CG.Niksic.yu PTT Makefile.in 041Net EUnetSombor Sezampro EUnetNis CG.Pljevlja.yu TippNet CG.BijeloPolje.CG.yu CG.Podgorica.yu CG.yu DrenikNet SuOnline BeoTelNet CG.Ulcinj.yu InfoSKY EUnet at Lite EUnet at Full EUnetKragujevac CG.Tivat.yu CG.HercegNovi.yu SCnet EUnetSubotica Makefile.am EUnetCacak
+
+ #>+ 2
+ docs-am:
--- kppp/icons/Makefile.in
+++ kppp/icons/Makefile.in
@@ -100,6 +100,7 @@
@@ -62082,6 +77698,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -583,26 +592,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kppp.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kppp.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kppp.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kppp.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kppp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kppp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kppp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kppp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kppp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kppp.png
+
+ #>+ 15
+ force-reedit:
--- kppp/logview/Makefile.in
+++ kppp/logview/Makefile.in
@@ -164,6 +164,7 @@
@@ -64582,6 +80234,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -604,7 +613,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in Makefile.am Iceland_general.rst
++KDE_DIST=Makefile.in Iceland_general.rst Makefile.am
+
+ #>+ 2
+ docs-am:
--- kppp/Rules/India/Makefile.in
+++ kppp/Rules/India/Makefile.in
@@ -110,6 +110,7 @@
@@ -65082,6 +80743,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -633,7 +642,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Wind_Family_Internet_InWind.rst Wind_Urbana_1088_Light.rst Wind_24ore_Urbane.rst Infostrada_Internet_SpZero.rst Infostrada_Libero1055_Base.rst Telecom_Interurbane_Oltre15Km.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Infostrada_Reg_Naz_Base.rst Tele2_Altri_ISP.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Telecom_Locali.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst
++KDE_DIST=Wind_Family_Internet_InWind.rst Wind_Urbana_1088_Light.rst Wind_24ore_Urbane.rst Infostrada_Internet_SpZero.rst Infostrada_Libero1055_Base.rst Telecom_Interurbane_Oltre15Km.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Infostrada_Reg_Naz_Base.rst Tele2_Altri_ISP.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Telecom_Locali.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst
+
+ #>+ 2
+ docs-am:
--- kppp/Rules/Jamaica/Makefile.in
+++ kppp/Rules/Jamaica/Makefile.in
@@ -110,6 +110,7 @@
@@ -65661,6 +81331,15 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
+@@ -418,7 +427,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. Macedonia Slovenia SouthAfrika Denmark Italy Croatia Yugoslavia India Jamaica Australia Sweden Bangladesh Portugal France Ukraine Bosnia_and_Herzegovina Kazakhstan Iceland Malaysia Germany Switzerland Austria Spain Finland Brasil Hungary Poland Norway Israel Turkey Belgium Romania Singapore Luxembourg Japan Greece United_Kingdom Uruguay Estonia Czechia Russia Netherlands Argentina SouthAfrica Indonesia Slovakia HongKong Ireland
++SUBDIRS =. Luxembourg Brasil Uruguay Malaysia France Iceland Greece Belgium Japan India Italy Portugal Spain Israel Switzerland HongKong Austria Norway Hungary Poland Jamaica Netherlands Russia Sweden Turkey Bangladesh Ireland Australia Indonesia Denmark Slovakia Slovenia Croatia Singapore Bosnia_and_Herzegovina Czechia Macedonia Romania Argentina Yugoslavia United_Kingdom Estonia Finland Germany SouthAfrica SouthAfrika Kazakhstan Ukraine
+ pkg_DATA = TEMPLATE
+ pkg_SCRIPTS = checkrules
+ pkgdir = $(kde_datadir)/kppp/Rules
@@ -428,7 +437,7 @@
all: docs-am all-recursive
@@ -65882,6 +81561,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -633,7 +642,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Freeler_Basis.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst BelBasis_Regio.rst OneTel_Toets_1658_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst BelBasis_Buiten_Regio.rst Makefile.in HetNet_Regelmatig_Surfen.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst BelPlus_Regio_Nummervoordeel.rst Cistron OneTel_Spaarstand_Regio.rst Tele2_Preselect_Buiten_Regio.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Tele2_Extra_Buiten_Regio.rst Makefile.am
++KDE_DIST=Freeler_Basis.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelBasis_Regio.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst OneTel_Toets_1658_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst BelBasis_Buiten_Regio.rst Makefile.in HetNet_Regelmatig_Surfen.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst BelPlus_Regio_Nummervoordeel.rst Cistron OneTel_Spaarstand_Regio.rst Tele2_Preselect_Buiten_Regio.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Tele2_Extra_Buiten_Regio.rst Makefile.am
+
+ #>+ 2
+ docs-am:
--- kppp/Rules/Norway/Makefile.in
+++ kppp/Rules/Norway/Makefile.in
@@ -110,6 +110,7 @@
@@ -67082,6 +82770,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -612,7 +621,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Telitel.rst Glocalnet.rst Telia.rst Crossnet-Affinity.rst Gts.rst Utfors.rst Nemtel.rst Rix_Telecom.rst Telerian.rst Transnet.rst Makefile.in Teleman.rst Universal_Telecom.rst RSLCom.rst Vattenfall.rst Tele8.rst ACN.rst Telenordia.rst Tele1_Europe.rst Tiscali.rst Supertel.rst Telia_Telebonus1.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Plusenergi.rst Home_se.rst Makefile.am Telia_Telebonus2.rst Tele2.rst
++KDE_DIST=Telitel.rst Glocalnet.rst Telia.rst Crossnet-Affinity.rst Gts.rst Utfors.rst Nemtel.rst Rix_Telecom.rst Telerian.rst Transnet.rst Makefile.in Teleman.rst Universal_Telecom.rst RSLCom.rst Vattenfall.rst Tele8.rst ACN.rst Telenordia.rst Tele1_Europe.rst Tiscali.rst Supertel.rst Telia_Telebonus1.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Plusenergi.rst Home_se.rst Telia_Telebonus2.rst Makefile.am Tele2.rst
+
+ #>+ 2
+ docs-am:
--- kppp/Rules/Switzerland/Makefile.in
+++ kppp/Rules/Switzerland/Makefile.in
@@ -110,6 +110,7 @@
@@ -67682,6 +83379,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -608,7 +617,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=041_1xx_xxx.rst 041_9xx_xxx.rst Lokalni_poziv.rst II_zona-do_200km.rst Makefile.in I_zona-ista_mreza.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am
++KDE_DIST=041_1xx_xxx.rst Lokalni_poziv.rst 041_9xx_xxx.rst II_zona-do_200km.rst Makefile.in I_zona-ista_mreza.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am
+
+ #>+ 2
+ docs-am:
--- krdc/Makefile.in
+++ krdc/Makefile.in
@@ -183,6 +183,7 @@
@@ -67782,6 +83488,72 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1057,11 +1066,11 @@
+ mocs: kfullscreenpanel.moc
+
+ #>+ 3
+-kremoteview.moc: $(srcdir)/kremoteview.h
+- $(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
++preferencesdialog.moc: $(srcdir)/preferencesdialog.h
++ $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
+
+ #>+ 2
+-mocs: kremoteview.moc
++mocs: preferencesdialog.moc
+
+ #>+ 3
+ keycapturedialog.moc: $(srcdir)/keycapturedialog.h
+@@ -1071,11 +1080,11 @@
+ mocs: keycapturedialog.moc
+
+ #>+ 3
+-preferencesdialog.moc: $(srcdir)/preferencesdialog.h
+- $(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
++kremoteview.moc: $(srcdir)/kremoteview.h
++ $(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
+
+ #>+ 2
+-mocs: preferencesdialog.moc
++mocs: kremoteview.moc
+
+ #>+ 3
+ maindialog.moc: $(srcdir)/maindialog.h
+@@ -1086,7 +1095,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc
++ -rm -f maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc
+
+ #>+ 2
+ KDE_DIST=maindialogwidget.h hostprofiles.ui.h Makefile.in smb2rdc.desktop pinup.png maindialogbase.ui keycapturewidget.ui _rfb._tcp pindown.png hostprofiles.ui pointcursor.png rdp.protocol maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png pointcursormask.png cr32-app-krdc.png krdc.desktop Makefile.am close.png
+@@ -1103,14 +1112,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+
+ #>+ 15
+ force-reedit:
+@@ -1151,7 +1160,7 @@
+
+
+ #>+ 11
+-krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc hostprofiles.moc
++krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc hostprofiles.moc
+ @echo 'creating krdc.all_cpp.cpp ...'; \
+ rm -f krdc.all_cpp.files krdc.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
--- krdc/rdp/Makefile.in
+++ krdc/rdp/Makefile.in
@@ -137,6 +137,7 @@
@@ -68082,6 +83854,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -798,7 +807,7 @@
+ -rm -f kcm_krfb.moc
+
+ #>+ 2
+-KDE_DIST=configurationwidget.ui Makefile.in kcm_krfb.h kcmkrfb.desktop Makefile.am
++KDE_DIST=configurationwidget.ui Makefile.in kcmkrfb.desktop kcm_krfb.h Makefile.am
+
+ #>+ 4
+ clean-ui:
--- krfb/kinetd/Makefile.in
+++ krfb/kinetd/Makefile.in
@@ -148,6 +148,7 @@
@@ -68282,6 +84063,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -972,7 +981,7 @@
+ -rm -f invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
+
+ #>+ 2
+-KDE_DIST=krfbiface.h manageinvitations.ui.h eventsrc personalinvitewidget.ui eyes-open.png cr32-app-krfb.png lo16-app-krfb.png connection-side-image.png Makefile.in eyes-open24.png rfbcontroller.h invitation.h personalinvitedialog.h trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui configuration.h xupdatescanner.h invitedialog.h krfb.desktop kinetd_krfb.desktop Makefile.am eyes-closed24.png
++KDE_DIST=krfbiface.h manageinvitations.ui.h eventsrc personalinvitewidget.ui eyes-open.png cr32-app-krfb.png lo16-app-krfb.png connection-side-image.png Makefile.in eyes-open24.png rfbcontroller.h invitation.h personalinvitedialog.h trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui configuration.h invitedialog.h xupdatescanner.h krfb.desktop kinetd_krfb.desktop Makefile.am eyes-closed24.png
+
+ #>+ 5
+ clean-idl:
+@@ -995,21 +1004,21 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krfb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+
+ #>+ 15
+ force-reedit:
--- krfb/krfb_httpd/Makefile.in
+++ krfb/krfb_httpd/Makefile.in
@@ -113,6 +113,7 @@
@@ -68782,6 +84600,64 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -587,42 +596,42 @@
+
+ #>+ 39
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
++ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
++ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps/ksirc.png
++ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps/ksirc.png
+- $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
+- $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ $(mkinstalldirs) $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ksirc.png $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps/ksirc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksirc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksirc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ksirc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksirc.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
++ -rm -f $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
++ -rm -f $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ -rm -f $(DESTDIR)$(ksircicondir)/hicolor/32x32/apps/ksirc.png
+ -rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ -rm -f $(DESTDIR)$(ksircicondir)/hicolor/16x16/apps/ksirc.png
+- -rm -f $(DESTDIR)$(ksircicondir)/hicolor/64x64/apps/ksirc.png
+- -rm -f $(DESTDIR)$(ksircicondir)/hicolor/48x48/apps/ksirc.png
+ -rm -f $(DESTDIR)$(ksircicondir)/hicolor/22x22/apps/ksirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
++ -rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksirc.png
+
+ #>+ 15
--- ksirc/img/emoticons/Makefile.in
+++ ksirc/img/emoticons/Makefile.in
@@ -110,6 +110,7 @@
@@ -68982,6 +84858,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -784,7 +793,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=action.png misc1.png mode.png bminus.png ominus.png ksirc_dock.png ppl.png misc2.png dccget.png misc3.png greenpin.png smiley.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png ksirc_dock.xpm dccsend.png ksirc_b.xpm info.png tile.xpm channels.xpm miscA.png ctcpping.png misc6.png info1.png Makefile.in stop.xpm misc7.png blueball.png X.png mdi.png bplus.png misc9.png elipsis.png misc8.png channel.xpm servinfo.png bluepin.png madsmiley.png part.png ksirc_a.xpm sdi.png misc4.png join.png misc5.png minus.png server.xpm error.png star.png mini-run.png notice.png kick.png start.xpm arrow.png plus.png quit.png Makefile.am
++KDE_DIST=action.png misc1.png mode.png bminus.png ominus.png ksirc_dock.png ppl.png misc2.png dccget.png misc3.png greenpin.png smiley.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png ksirc_dock.xpm dccsend.png ksirc_b.xpm tile.xpm info.png channels.xpm miscA.png ctcpping.png misc6.png info1.png Makefile.in stop.xpm misc7.png blueball.png X.png mdi.png bplus.png misc9.png elipsis.png misc8.png channel.xpm servinfo.png bluepin.png madsmiley.png part.png ksirc_a.xpm sdi.png misc4.png join.png misc5.png minus.png server.xpm error.png star.png mini-run.png kick.png notice.png start.xpm arrow.png plus.png quit.png Makefile.am
+
+ #>+ 2
+ docs-am:
--- ksirc/KSOpenkSirc/Makefile.in
+++ ksirc/KSOpenkSirc/Makefile.in
@@ -148,6 +148,7 @@
@@ -69482,6 +85367,155 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1356,18 +1365,18 @@
+ ksirc_DEPENDENCIES = libkdeinit_ksirc.la
+
+ #>+ 3
+-servercontroller.moc: $(srcdir)/servercontroller.h
+- $(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
++ksircprocess.moc: $(srcdir)/ksircprocess.h
++ $(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
+
+ #>+ 2
+-mocs: servercontroller.moc
++mocs: ksircprocess.moc
+
+ #>+ 3
+-ksircprocess.moc: $(srcdir)/ksircprocess.h
+- $(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
++servercontroller.moc: $(srcdir)/servercontroller.h
++ $(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
+
+ #>+ 2
+-mocs: ksircprocess.moc
++mocs: servercontroller.moc
+
+ #>+ 3
+ ioDCC.moc: $(srcdir)/ioDCC.h
+@@ -1384,13 +1393,6 @@
+ mocs: ssfeprompt.moc
+
+ #>+ 3
+-chanButtons.moc: $(srcdir)/chanButtons.h
+- $(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
+-
+-#>+ 2
+-mocs: chanButtons.moc
+-
+-#>+ 3
+ FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
+ $(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
+
+@@ -1405,6 +1407,13 @@
+ mocs: ahistlineedit.moc
+
+ #>+ 3
++chanButtons.moc: $(srcdir)/chanButtons.h
++ $(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
++
++#>+ 2
++mocs: chanButtons.moc
++
++#>+ 3
+ alistbox.moc: $(srcdir)/alistbox.h
+ $(MOC) $(srcdir)/alistbox.h -o alistbox.moc
+
+@@ -1433,13 +1442,6 @@
+ mocs: ksview.moc
+
+ #>+ 3
+-dccNew.moc: $(srcdir)/dccNew.h
+- $(MOC) $(srcdir)/dccNew.h -o dccNew.moc
+-
+-#>+ 2
+-mocs: dccNew.moc
+-
+-#>+ 3
+ ioLAG.moc: $(srcdir)/ioLAG.h
+ $(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
+
+@@ -1447,18 +1449,18 @@
+ mocs: ioLAG.moc
+
+ #>+ 3
+-mditoplevel.moc: $(srcdir)/mditoplevel.h
+- $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
++dccNew.moc: $(srcdir)/dccNew.h
++ $(MOC) $(srcdir)/dccNew.h -o dccNew.moc
+
+ #>+ 2
+-mocs: mditoplevel.moc
++mocs: dccNew.moc
+
+ #>+ 3
+-topic.moc: $(srcdir)/topic.h
+- $(MOC) $(srcdir)/topic.h -o topic.moc
++mditoplevel.moc: $(srcdir)/mditoplevel.h
++ $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
+
+ #>+ 2
+-mocs: topic.moc
++mocs: mditoplevel.moc
+
+ #>+ 3
+ colorpicker.moc: $(srcdir)/colorpicker.h
+@@ -1475,6 +1477,13 @@
+ mocs: objFinder.moc
+
+ #>+ 3
++topic.moc: $(srcdir)/topic.h
++ $(MOC) $(srcdir)/topic.h -o topic.moc
++
++#>+ 2
++mocs: topic.moc
++
++#>+ 3
+ displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
+ $(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
+
+@@ -1503,18 +1512,18 @@
+ mocs: dccToplevel.moc
+
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
++ $(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
+
+ #>+ 2
+-mocs: toplevel.moc
++mocs: NewWindowDialog.moc
+
+ #>+ 3
+-NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
+- $(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
++toplevel.moc: $(srcdir)/toplevel.h
++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+
+ #>+ 2
+-mocs: NewWindowDialog.moc
++mocs: toplevel.moc
+
+ #>+ 3
+ dockservercontroller.moc: $(srcdir)/dockservercontroller.h
+@@ -1539,7 +1548,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f servercontroller.moc ksircprocess.moc ioDCC.moc ssfeprompt.moc chanButtons.moc FilterRuleEditor.moc ahistlineedit.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc colorpicker.moc objFinder.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc kstextview.moc ioNotify.moc
++ -rm -f ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc colorpicker.moc objFinder.moc topic.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc kstextview.moc ioNotify.moc
+
+ #>+ 2
+ KDE_DIST=advfollow.pl sirc.help.gz nickColourMaker.h eventsrc displayMgrMDI.h ksircserver.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in autodcc.pl dccManagerbase.ui chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop dccNewbase.ui ksircchannel.h FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h Makefile.am
+@@ -1593,7 +1602,7 @@
+
+
+ #>+ 11
+-libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp ksircprocess.moc servercontroller.moc ssfeprompt.moc ioDCC.moc ahistlineedit.moc FilterRuleEditor.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc objFinder.moc colorpicker.moc topic.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
++libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc objFinder.moc colorpicker.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
+ @echo 'creating libkdeinit_ksirc_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_ksirc_la.all_cpp.files libkdeinit_ksirc_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
--- ksirc/puke/Makefile.in
+++ ksirc/puke/Makefile.in
@@ -152,6 +152,7 @@
@@ -69582,6 +85616,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -896,18 +905,18 @@
+ mocs: ptablevw.moc
+
+ #>+ 3
+-pmenudta.moc: $(srcdir)/pmenudta.h
+- $(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
++ppopmenu.moc: $(srcdir)/ppopmenu.h
++ $(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
+
+ #>+ 2
+-mocs: pmenudta.moc
++mocs: ppopmenu.moc
+
+ #>+ 3
+-ppopmenu.moc: $(srcdir)/ppopmenu.h
+- $(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
++pmenudta.moc: $(srcdir)/pmenudta.h
++ $(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
+
+ #>+ 2
+-mocs: ppopmenu.moc
++mocs: pmenudta.moc
+
+ #>+ 3
+ pkfiledialog.moc: $(srcdir)/pkfiledialog.h
+@@ -918,7 +927,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f pframe.moc ptabdialog.moc plabel.moc playout.moc plined.moc pobject.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc pmenudta.moc ppopmenu.moc pkfiledialog.moc
++ -rm -f pframe.moc ptabdialog.moc plabel.moc playout.moc plined.moc pobject.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
+
+ #>+ 2
+ KDE_DIST=pobjfinder.h load_all.pm palistbox.pm ppopmenu.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h dcc_status.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm plistbox.pm pmenudta.pm pkfiledialog.pm dcc_progress.pm ptablevw.pm plabel.pm small.pl pprogress.pm pkfiledialog.h ptabdialog.pm Makefile.am
+@@ -965,7 +974,7 @@
+
+
+ #>+ 11
+-libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
++libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc pmenudta.moc ppopmenu.moc pkfiledialog.moc
+ @echo 'creating libpuke_la.all_cpp.cpp ...'; \
+ rm -f libpuke_la.all_cpp.files libpuke_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
--- ktalkd/kcmktalkd/Makefile.in
+++ ktalkd/kcmktalkd/Makefile.in
@@ -149,6 +149,7 @@
@@ -69682,6 +85759,82 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -794,18 +803,18 @@
+ mocs: answmachpage.moc
+
+ #>+ 3
+-soundpage.moc: $(srcdir)/soundpage.h
+- $(MOC) $(srcdir)/soundpage.h -o soundpage.moc
++main.moc: $(srcdir)/main.h
++ $(MOC) $(srcdir)/main.h -o main.moc
+
+ #>+ 2
+-mocs: soundpage.moc
++mocs: main.moc
+
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+- $(MOC) $(srcdir)/main.h -o main.moc
++soundpage.moc: $(srcdir)/soundpage.h
++ $(MOC) $(srcdir)/soundpage.h -o soundpage.moc
+
+ #>+ 2
+-mocs: main.moc
++mocs: soundpage.moc
+
+ #>+ 3
+ forwmachpage.moc: $(srcdir)/forwmachpage.h
+@@ -816,7 +825,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f answmachpage.moc soundpage.moc main.moc forwmachpage.moc
++ -rm -f answmachpage.moc main.moc soundpage.moc forwmachpage.moc
+
+ #>+ 2
+ KDE_DIST=cr48-app-ktalkd.png cr128-app-ktalkd.png main.h cr22-app-ktalkd.png soundpage.h Makefile.in forwmachpage.h cr32-app-ktalkd.png cr16-app-ktalkd.png kcmktalkd.desktop answmachpage.h Makefile.am
+@@ -830,23 +839,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktalkd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktalkd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktalkd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktalkd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ktalkd.png
+
+ #>+ 15
+ force-reedit:
+@@ -887,7 +896,7 @@
+
+
+ #>+ 11
+-kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp answmachpage.moc forwmachpage.moc main.moc soundpage.moc
++kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp answmachpage.moc forwmachpage.moc soundpage.moc main.moc
+ @echo 'creating kcm_ktalkd_la.all_cpp.cpp ...'; \
+ rm -f kcm_ktalkd_la.all_cpp.files kcm_ktalkd_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
--- ktalkd/ktalkd/machines/Makefile.in
+++ ktalkd/ktalkd/machines/Makefile.in
@@ -145,6 +145,7 @@
@@ -69882,6 +86035,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -922,7 +931,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=announce.h defs.h includ.h find_user.h unixsock.h prot_talkd.h readconf.cpp Makefile.in table.h readconf.h proto.h options.h ktalkd.wav process.h otalkd.h threads.h Makefile.am
++KDE_DIST=announce.h defs.h includ.h find_user.h unixsock.h prot_talkd.h readconf.cpp Makefile.in table.h proto.h readconf.h options.h ktalkd.wav process.h otalkd.h threads.h Makefile.am
+
+ #>+ 2
+ docs-am:
--- ktalkd/ktalkdlg/Makefile.in
+++ ktalkd/ktalkdlg/Makefile.in
@@ -136,6 +136,7 @@
@@ -70282,6 +86444,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -901,18 +910,18 @@
+
+
+ #>+ 3
+-kcmreslisa.moc: $(srcdir)/kcmreslisa.h
+- $(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
++portsettingsbar.moc: $(srcdir)/portsettingsbar.h
++ $(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
+
+ #>+ 2
+-mocs: kcmreslisa.moc
++mocs: portsettingsbar.moc
+
+ #>+ 3
+-portsettingsbar.moc: $(srcdir)/portsettingsbar.h
+- $(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
++kcmreslisa.moc: $(srcdir)/kcmreslisa.h
++ $(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
+
+ #>+ 2
+-mocs: portsettingsbar.moc
++mocs: kcmreslisa.moc
+
+ #>+ 3
+ kcmkiolan.moc: $(srcdir)/kcmkiolan.h
+@@ -937,7 +946,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
++ -rm -f portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
+
+ #>+ 2
+ KDE_DIST=kcmreslisa.desktop portsettingsbar.h Makefile.in findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop configure.in.in kcmlisa.h kcmkiolan.h setupwizard.h Makefile.am
+@@ -988,7 +997,7 @@
+
+
+ #>+ 11
+-kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
++kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
+ @echo 'creating kcm_lanbrowser_la.all_cpp.cpp ...'; \
+ rm -f kcm_lanbrowser_la.all_cpp.files kcm_lanbrowser_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
--- lanbrowsing/kio_lan/Makefile.in
+++ lanbrowsing/kio_lan/Makefile.in
@@ -151,6 +151,7 @@
@@ -70682,6 +86887,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -829,7 +838,7 @@
+ -rm -f loader.moc image.moc testlibrss.moc
+
+ #>+ 2
+-KDE_DIST=tools_p.h librss.doxyfile rss-faq.html testlibrss.h Makefile.in Makefile.am
++KDE_DIST=librss.doxyfile tools_p.h rss-faq.html testlibrss.h Makefile.in Makefile.am
+
+ #>+ 3
+ clean-closures:
--- Makefile.in
+++ Makefile.in
@@ -134,6 +134,7 @@
@@ -70799,7 +87013,7 @@
#>+ 2
-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
@@ -70903,6 +87117,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -801,18 +810,18 @@
+ mocs: mainconfig.moc
+
+ #>+ 3
+-ifconfigpage.moc: $(srcdir)/ifconfigpage.h
+- $(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
++kcmwifi.moc: $(srcdir)/kcmwifi.h
++ $(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
+
+ #>+ 2
+-mocs: ifconfigpage.moc
++mocs: kcmwifi.moc
+
+ #>+ 3
+-kcmwifi.moc: $(srcdir)/kcmwifi.h
+- $(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
++ifconfigpage.moc: $(srcdir)/ifconfigpage.h
++ $(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
+
+ #>+ 2
+-mocs: kcmwifi.moc
++mocs: ifconfigpage.moc
+
+ #>+ 3
+ wificonfig.moc: $(srcdir)/wificonfig.h
+@@ -823,7 +832,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f mainconfig.moc ifconfigpage.moc kcmwifi.moc wificonfig.moc
++ -rm -f mainconfig.moc kcmwifi.moc ifconfigpage.moc wificonfig.moc
+
+ #>+ 2
+ KDE_DIST=mainconfigbase.ui mainconfig.h configcrypto.ui configcrypto.ui.h configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h vendorconfig.h indent-options ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configpower.ui Makefile.am
+@@ -882,7 +891,7 @@
+
+
+ #>+ 11
+-kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp $(srcdir)/vendorconfig.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp mainconfig.moc mainconfigbase.moc kcmwifi.moc ifconfigpage.moc configpower.moc wificonfig.moc ifconfigpagebase.moc configcrypto.moc
++kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp $(srcdir)/vendorconfig.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp mainconfig.moc mainconfigbase.moc ifconfigpage.moc kcmwifi.moc configpower.moc wificonfig.moc ifconfigpagebase.moc configcrypto.moc
+ @echo 'creating kcm_wifi_la.all_cpp.cpp ...'; \
+ rm -f kcm_wifi_la.all_cpp.files kcm_wifi_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
--- wifi/kwireless/Makefile.in
+++ wifi/kwireless/Makefile.in
@@ -147,6 +147,7 @@
@@ -71203,6 +87460,91 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -979,18 +988,18 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub interface_dcop.kidl
+
+ #>+ 3
+-networkscanning.moc: $(srcdir)/networkscanning.h
+- $(MOC) $(srcdir)/networkscanning.h -o networkscanning.moc
++interface_wireless_wirelessextensions.moc: $(srcdir)/interface_wireless_wirelessextensions.h
++ $(MOC) $(srcdir)/interface_wireless_wirelessextensions.h -o interface_wireless_wirelessextensions.moc
+
+ #>+ 2
+-mocs: networkscanning.moc
++mocs: interface_wireless_wirelessextensions.moc
+
+ #>+ 3
+-interface_wireless_wirelessextensions.moc: $(srcdir)/interface_wireless_wirelessextensions.h
+- $(MOC) $(srcdir)/interface_wireless_wirelessextensions.h -o interface_wireless_wirelessextensions.moc
++networkscanning.moc: $(srcdir)/networkscanning.h
++ $(MOC) $(srcdir)/networkscanning.h -o networkscanning.moc
+
+ #>+ 2
+-mocs: interface_wireless_wirelessextensions.moc
++mocs: networkscanning.moc
+
+ #>+ 3
+ interface_wireless.moc: $(srcdir)/interface_wireless.h
+@@ -1015,7 +1024,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f networkscanning.moc interface_wireless_wirelessextensions.moc interface_wireless.moc kwifimanager.moc strength.moc
++ -rm -f interface_wireless_wirelessextensions.moc networkscanning.moc interface_wireless.moc kwifimanager.moc strength.moc
+
+ #>+ 2
+ KDE_DIST=kwifimanagerui.rc hi64-app-kwifimanager.png hi16-app-kwifimanager.png hi128-app-kwifimanager.png hi32-app-kwifimanager.png hi22-app-kwifimanager.png hisc-app-kwifimanager.svgz Makefile.in hi48-app-kwifimanager.png configure.in.in kwifimanager.desktop Makefile.am
+@@ -1030,29 +1039,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwifimanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwifimanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwifimanager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwifimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwifimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwifimanager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwifimanager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwifimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwifimanager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwifimanager.svgz
+
+ #>+ 15
+ force-reedit:
+@@ -1093,7 +1102,7 @@
+
+
+ #>+ 11
+-kwifimanager.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/interface_wireless.cpp $(srcdir)/interface_wireless_wirelessextensions.cpp $(srcdir)/networkscanning.cpp $(srcdir)/kwifimanager.cpp $(srcdir)/locator.cpp $(srcdir)/main.cpp $(srcdir)/picture.cpp $(srcdir)/speed.cpp $(srcdir)/statistics.cpp $(srcdir)/status.cpp $(srcdir)/strength.cpp $(srcdir)/asusled.cpp interface_dcop_skel.cpp interface_wireless_wirelessextensions.moc networkscanning.moc interface_wireless.moc kwifimanager.moc strength.moc
++kwifimanager.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/interface_wireless.cpp $(srcdir)/interface_wireless_wirelessextensions.cpp $(srcdir)/networkscanning.cpp $(srcdir)/kwifimanager.cpp $(srcdir)/locator.cpp $(srcdir)/main.cpp $(srcdir)/picture.cpp $(srcdir)/speed.cpp $(srcdir)/statistics.cpp $(srcdir)/status.cpp $(srcdir)/strength.cpp $(srcdir)/asusled.cpp interface_dcop_skel.cpp networkscanning.moc interface_wireless_wirelessextensions.moc interface_wireless.moc kwifimanager.moc strength.moc
+ @echo 'creating kwifimanager.all_cpp.cpp ...'; \
+ rm -f kwifimanager.all_cpp.files kwifimanager.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kwifimanager.all_cpp.final; \
--- wifi/pixmaps/Makefile.in
+++ wifi/pixmaps/Makefile.in
@@ -110,6 +110,7 @@
More information about the pkg-kde-commits
mailing list