rev 4246 - trunk/packages/kdegraphics/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:17:49 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:17:17 +0000 (Sun, 30 Jul 2006)
New Revision: 4246
Modified:
trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-07-30 01:11:49 UTC (rev 4245)
+++ trunk/packages/kdegraphics/debian/patches/98_buildprep.diff 2006-07-30 01:17:17 UTC (rev 4246)
@@ -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
@@ -360,22 +360,22 @@
@@ -3872,7 +3910,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,
@@ -4154,8 +4192,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
@@ -4413,7 +4451,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
@@ -5599,7 +5637,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,
@@ -5618,7 +5656,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 $@
@@ -5644,7 +5682,15 @@
} >&5
-@@ -1314,7 +1954,7 @@
+@@ -1303,7 +1943,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1314,7 +1953,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -5653,7 +5699,18 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1349,8 +1989,8 @@
+@@ -1336,9 +1975,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
+@@ -1349,8 +1986,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.
@@ -5664,7 +5721,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1363,20 +2003,34 @@
+@@ -1363,20 +2000,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -5709,13 +5766,16 @@
echo
cat <<\_ASBOX
-@@ -1387,22 +2041,22 @@
+@@ -1387,22 +2038,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
@@ -5735,11 +5795,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
-@@ -1414,26 +2068,24 @@
+@@ -1414,26 +2071,24 @@
## ----------- ##
_ASBOX
echo
@@ -5771,7 +5834,7 @@
# Predefined preprocessor variables.
-@@ -1464,14 +2116,17 @@
+@@ -1464,14 +2119,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -5796,7 +5859,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;}
-@@ -1487,8 +2142,8 @@
+@@ -1487,8 +2145,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -5807,7 +5870,7 @@
esac
fi
else
-@@ -1500,12 +2155,11 @@
+@@ -1500,12 +2158,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -5823,7 +5886,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
-@@ -1530,8 +2184,7 @@
+@@ -1530,8 +2187,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -5833,7 +5896,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1548,12 +2201,6 @@
+@@ -1548,12 +2204,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -5846,7 +5909,7 @@
-@@ -1570,110 +2217,165 @@
+@@ -1570,110 +2220,165 @@
@@ -6064,7 +6127,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1683,17 +2385,17 @@
+@@ -1683,17 +2388,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6085,7 +6148,7 @@
am__api_version="1.9"
-@@ -1715,8 +2417,8 @@
+@@ -1715,8 +2420,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.
@@ -6096,7 +6159,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1738,7 +2440,7 @@
+@@ -1738,7 +2443,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6105,7 +6168,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.
-@@ -1757,21 +2459,22 @@
+@@ -1757,21 +2462,22 @@
;;
esac
done
@@ -6133,7 +6196,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1785,8 +2488,8 @@
+@@ -1785,8 +2491,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
@@ -6144,7 +6207,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1798,8 +2501,8 @@
+@@ -1798,8 +2504,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6155,7 +6218,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1809,8 +2512,8 @@
+@@ -1809,8 +2515,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6166,7 +6229,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1852,8 +2555,8 @@
+@@ -1852,8 +2558,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6177,7 +6240,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1904,8 +2607,8 @@
+@@ -1904,8 +2610,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
@@ -6188,7 +6251,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1918,41 +2621,44 @@
+@@ -1918,54 +2624,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6223,10 +6286,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
@@ -6234,21 +6298,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
-@@ -1960,12 +2666,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=
@@ -6260,7 +6330,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2036,8 +2742,8 @@
+@@ -2036,8 +2745,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
@@ -6271,7 +6341,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2050,32 +2756,34 @@
+@@ -2050,32 +2759,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6313,7 +6383,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2088,27 +2796,41 @@
+@@ -2088,27 +2799,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6362,7 +6432,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2128,6 +2850,31 @@
+@@ -2128,6 +2853,31 @@
@@ -6394,7 +6464,7 @@
unset CDPATH
-@@ -2146,14 +2893,14 @@
+@@ -2146,14 +2896,14 @@
if test "x$prefix" = "xNONE"; then
@@ -6412,7 +6482,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2196,8 +2943,8 @@
+@@ -2196,8 +2946,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6423,7 +6493,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2208,8 +2955,8 @@
+@@ -2208,8 +2958,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6434,7 +6504,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2218,14 +2965,14 @@
+@@ -2218,14 +2968,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -6452,7 +6522,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2268,8 +3015,8 @@
+@@ -2268,8 +3018,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6463,7 +6533,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2280,8 +3027,8 @@
+@@ -2280,8 +3030,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6474,7 +6544,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2304,16 +3051,16 @@
+@@ -2304,16 +3054,16 @@
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
@@ -6497,7 +6567,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2326,13 +3073,13 @@
+@@ -2326,13 +3076,13 @@
@@ -6515,7 +6585,7 @@
val=
-@@ -2349,11 +3096,11 @@
+@@ -2349,11 +3099,11 @@
@@ -6529,7 +6599,7 @@
am_make=${MAKE-make}
-@@ -2363,8 +3110,8 @@
+@@ -2363,8 +3113,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6540,7 +6610,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2391,15 +3138,15 @@
+@@ -2391,15 +3141,15 @@
fi
@@ -6561,7 +6631,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2419,10 +3166,9 @@
+@@ -2419,10 +3169,9 @@
@@ -6574,7 +6644,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2442,18 +3188,18 @@
+@@ -2442,18 +3191,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -6600,7 +6670,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2462,12 +3208,12 @@
+@@ -2462,12 +3211,12 @@
else
kde_use_strict_options="no"
@@ -6617,7 +6687,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2476,20 +3222,21 @@
+@@ -2476,20 +3225,21 @@
else
kde_use_warnings="yes"
@@ -6644,7 +6714,7 @@
CFLAGS=" $CFLAGS"
-@@ -2501,8 +3248,8 @@
+@@ -2501,8 +3251,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
@@ -6655,7 +6725,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2515,32 +3262,34 @@
+@@ -2515,32 +3265,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6697,7 +6767,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2553,36 +3302,51 @@
+@@ -2553,36 +3305,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6759,7 +6829,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2595,74 +3359,34 @@
+@@ -2595,74 +3362,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6843,7 +6913,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2676,7 +3400,7 @@
+@@ -2676,7 +3403,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6852,7 +6922,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2687,6 +3411,7 @@
+@@ -2687,6 +3414,7 @@
fi
done
done
@@ -6860,7 +6930,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2704,22 +3429,23 @@
+@@ -2704,22 +3432,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6891,7 +6961,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2732,36 +3458,38 @@
+@@ -2732,36 +3461,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6938,7 +7008,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2774,29 +3502,45 @@
+@@ -2774,29 +3505,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6990,7 +7060,7 @@
fi
fi
-@@ -2809,25 +3553,38 @@
+@@ -2809,21 +3556,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7000,53 +7070,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
-@@ -2843,51 +3600,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.*.
+@@ -2848,46 +3609,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.
@@ -7055,9 +7113,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
@@ -7070,7 +7153,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
@@ -7078,47 +7166,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
-@@ -2899,14 +3645,12 @@
- { (exit 77); exit 77; }; }
+@@ -2900,19 +3685,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
@@ -7128,7 +7216,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
-@@ -2931,83 +3675,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
+@@ -2931,22 +3720,27 @@
fi
fi
fi
@@ -7137,20 +7237,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
@@ -7158,100 +7258,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
+@@ -2957,9 +3751,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
+@@ -2973,14 +3766,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
+@@ -3000,14 +3793,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
@@ -7264,11 +7323,9 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3023,14 +3768,16 @@
- { (exit 1); exit 1; }; }
- fi
+@@ -3025,12 +3824,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
@@ -7278,23 +7335,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
-@@ -3079,24 +3826,28 @@
+@@ -3053,24 +3852,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
+@@ -3079,24 +3890,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
@@ -7322,7 +7422,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3138,97 +3889,23 @@
+@@ -3112,24 +3927,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
+@@ -3138,285 +3965,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7376,10 +7521,7 @@
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-+
-+int
-+main ()
- {
+-{
- char *s;
- va_list v;
- va_start (v,p);
@@ -7387,7 +7529,7 @@
- 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
@@ -7396,17 +7538,18 @@
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--
+
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
--int
--main ()
--{
+ int
+ main ()
+ {
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++
;
return 0;
}
@@ -7422,13 +7565,47 @@
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext
- if { (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=$?
-@@ -3250,81 +3927,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
@@ -7514,9 +7691,48 @@
;
return 0;
}
-@@ -3351,30 +3971,104 @@
+ _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_prog_cc_g=yes
@@ -7526,16 +7742,17 @@
-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
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
++rm -f core 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
++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
@@ -7601,6 +7818,11 @@
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
@@ -7617,17 +7839,51 @@
}
_ACEOF
-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=$?
-@@ -3396,27 +4090,36 @@
+ grep -v '^ *+' conftest.er1 >conftest.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
- break
+ ac_cv_prog_cc_c89=$ac_arg
@@ -7639,7 +7895,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
@@ -7674,7 +7930,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3425,8 +4128,8 @@
+@@ -3425,8 +4245,8 @@
depcc="$CC" am_compiler_list=
@@ -7685,7 +7941,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3515,8 +4218,8 @@
+@@ -3515,8 +4335,8 @@
fi
fi
@@ -7696,7 +7952,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3538,8 +4241,8 @@
+@@ -3538,8 +4358,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
@@ -7707,7 +7963,23 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3599,9 +4302,10 @@
+@@ -3573,8 +4393,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
+@@ -3599,9 +4424,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7719,7 +7991,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3639,6 +4343,7 @@
+@@ -3611,8 +4437,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
+@@ -3639,6 +4470,7 @@
ac_preproc_ok=:
break
fi
@@ -7727,7 +8015,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3656,8 +4361,8 @@
+@@ -3656,8 +4488,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7738,7 +8026,23 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3706,9 +4411,10 @@
+@@ -3680,8 +4512,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
+@@ -3706,9 +4543,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7750,7 +8054,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3746,6 +4452,7 @@
+@@ -3718,8 +4556,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
+@@ -3746,6 +4589,7 @@
ac_preproc_ok=:
break
fi
@@ -7758,7 +8078,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3796,18 +4503,22 @@
+@@ -3796,18 +4640,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -7786,7 +8106,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3820,36 +4531,38 @@
+@@ -3820,36 +4668,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7833,7 +8153,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3862,55 +4575,70 @@
+@@ -3862,55 +4712,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7895,22 +8215,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); }
@@ -7922,15 +8257,61 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3959,24 +4687,28 @@
+@@ -3933,24 +4813,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
+@@ -3959,24 +4851,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
@@ -7958,7 +8339,52 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -4018,47 +4750,18 @@
+@@ -3992,24 +4888,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
+@@ -4018,70 +4926,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8010,7 +8436,50 @@
;
return 0;
}
-@@ -4090,20 +4793,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
+@@ -4090,61 +4981,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8036,9 +8505,48 @@
;
return 0;
}
-@@ -4130,21 +4832,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
@@ -8047,21 +8555,22 @@
sed 's/^/| /' conftest.$ac_ext >&5
+
-+fi
-+
-+rm -f 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
-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
++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
@@ -8084,7 +8593,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4153,8 +4874,8 @@
+@@ -4153,8 +5074,8 @@
depcc="$CXX" am_compiler_list=
@@ -8095,7 +8604,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4243,8 +4964,8 @@
+@@ -4243,8 +5164,8 @@
fi
fi
@@ -8106,7 +8615,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4262,8 +4983,8 @@
+@@ -4262,8 +5183,8 @@
@@ -8117,7 +8626,52 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4314,13 +5035,14 @@
+@@ -4288,24 +5209,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
+@@ -4314,13 +5247,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8125,17 +8679,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:
-@@ -4362,17 +5084,16 @@
+@@ -4362,17 +5296,16 @@
fi
fi
@@ -8157,17 +8712,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'
-@@ -4426,7 +5147,9 @@
+@@ -4400,24 +5333,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
+@@ -4426,8 +5371,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"
-@@ -4440,29 +5163,28 @@
+ ac_ext=c
+@@ -4440,29 +5387,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8205,17 +8807,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'
-@@ -4515,7 +5237,9 @@
+@@ -4489,24 +5435,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
+@@ -4515,8 +5473,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"
-@@ -4529,13 +5253,13 @@
+ ac_ext=c
+@@ -4529,13 +5489,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8233,7 +8882,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4556,16 +5280,15 @@
+@@ -4556,16 +5516,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8254,17 +8903,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'
-@@ -4618,7 +5341,9 @@
+@@ -4592,24 +5551,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
+@@ -4618,8 +5589,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"
-@@ -4632,16 +5357,16 @@
+ ac_ext=c
+@@ -4632,16 +5605,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8285,7 +8981,7 @@
:
fi
-@@ -4656,16 +5381,15 @@
+@@ -4656,16 +5629,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"
@@ -8306,17 +9002,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'
-@@ -4718,7 +5442,9 @@
+@@ -4692,24 +5664,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
+@@ -4718,8 +5702,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"
-@@ -4732,27 +5458,26 @@
+ ac_ext=c
+@@ -4732,27 +5718,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8351,17 +9094,64 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4803,7 +5528,9 @@
+@@ -4777,24 +5762,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
+@@ -4803,8 +5800,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"
-@@ -4817,13 +5544,13 @@
+ ac_ext=c
+@@ -4817,13 +5816,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -8379,7 +9169,7 @@
:
fi
-@@ -4831,16 +5558,15 @@
+@@ -4831,16 +5830,15 @@
;;
esac
@@ -8400,17 +9190,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'
-@@ -4893,7 +5619,9 @@
+@@ -4867,24 +5865,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
+@@ -4893,8 +5903,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"
-@@ -4907,28 +5635,27 @@
+ ac_ext=c
+@@ -4907,28 +5919,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8447,17 +9284,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'
-@@ -4981,7 +5708,9 @@
+@@ -4955,24 +5966,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
+@@ -4981,8 +6004,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"
-@@ -4995,28 +5724,27 @@
+ ac_ext=c
+@@ -4995,28 +6020,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8494,17 +9378,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'
-@@ -5069,7 +5797,9 @@
+@@ -5043,24 +6067,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
+@@ -5069,8 +6105,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"
-@@ -5083,13 +5813,13 @@
+ ac_ext=c
+@@ -5083,13 +6121,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8522,7 +9453,7 @@
:
fi
-@@ -5101,13 +5831,13 @@
+@@ -5101,13 +6139,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -8540,7 +9471,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5115,16 +5845,15 @@
+@@ -5115,16 +6153,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -8561,17 +9492,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'
-@@ -5177,7 +5906,9 @@
+@@ -5151,24 +6188,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
+@@ -5177,8 +6226,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"
-@@ -5191,13 +5922,13 @@
+ ac_ext=c
+@@ -5191,13 +6242,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8589,7 +9567,7 @@
:
fi
-@@ -5209,16 +5940,15 @@
+@@ -5209,16 +6260,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -8610,17 +9588,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'
-@@ -5271,7 +6001,9 @@
+@@ -5245,24 +6295,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
+@@ -5271,8 +6333,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"
-@@ -5285,28 +6017,27 @@
+ ac_ext=c
+@@ -5285,28 +6349,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8657,17 +9682,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'
-@@ -5359,7 +6090,9 @@
+@@ -5333,24 +6396,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
+@@ -5359,8 +6434,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"
-@@ -5373,28 +6106,27 @@
+ ac_ext=c
+@@ -5373,28 +6450,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8704,17 +9776,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'
-@@ -5447,7 +6179,9 @@
+@@ -5421,24 +6497,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
+@@ -5447,8 +6535,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"
-@@ -5461,28 +6195,27 @@
+ ac_ext=c
+@@ -5461,28 +6551,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8751,17 +9870,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'
-@@ -5535,7 +6268,9 @@
+@@ -5509,24 +6598,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
+@@ -5535,8 +6636,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"
-@@ -5549,13 +6284,13 @@
+ ac_ext=c
+@@ -5549,13 +6652,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8779,7 +9945,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5563,37 +6298,37 @@
+@@ -5563,37 +6666,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -8831,7 +9997,52 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5651,9 +6386,10 @@
+@@ -5625,24 +6728,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
+@@ -5651,18 +6766,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8839,11 +10050,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
-@@ -5661,8 +6397,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -8854,7 +10066,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5682,16 +6418,15 @@
+@@ -5682,16 +6798,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -8875,17 +10087,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'
-@@ -5744,7 +6479,9 @@
+@@ -5718,24 +6833,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
+@@ -5744,8 +6871,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"
-@@ -5758,29 +6495,28 @@
+ ac_ext=c
+@@ -5758,29 +6887,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8923,17 +10182,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'
-@@ -5833,7 +6569,9 @@
+@@ -5807,24 +6935,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
+@@ -5833,8 +6973,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"
-@@ -5847,28 +6585,27 @@
+ ac_ext=c
+@@ -5847,28 +6989,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8970,17 +10276,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'
-@@ -5921,7 +6658,9 @@
+@@ -5895,24 +7036,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
+@@ -5921,8 +7074,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"
-@@ -5935,28 +6674,27 @@
+ ac_ext=c
+@@ -5935,28 +7090,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9017,17 +10370,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'
-@@ -6009,7 +6747,9 @@
+@@ -5983,24 +7137,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
+@@ -6009,8 +7175,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"
-@@ -6023,28 +6763,27 @@
+ ac_ext=c
+@@ -6023,28 +7191,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9064,17 +10464,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'
-@@ -6097,7 +6836,9 @@
+@@ -6071,24 +7238,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
+@@ -6097,8 +7276,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"
-@@ -6111,28 +6852,27 @@
+ ac_ext=c
+@@ -6111,28 +7292,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9111,17 +10558,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'
-@@ -6185,7 +6925,9 @@
+@@ -6159,24 +7339,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
+@@ -6185,8 +7377,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"
-@@ -6199,13 +6941,13 @@
+ ac_ext=c
+@@ -6199,13 +7393,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9139,7 +10633,7 @@
:
fi
-@@ -6312,13 +7054,13 @@
+@@ -6312,13 +7506,13 @@
fi
@@ -9156,7 +10650,23 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6374,9 +7116,10 @@
+@@ -6348,8 +7542,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
+@@ -6374,9 +7573,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9168,7 +10678,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6414,6 +7157,7 @@
+@@ -6386,8 +7586,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
+@@ -6414,6 +7619,7 @@
ac_preproc_ok=:
break
fi
@@ -9176,7 +10702,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6431,8 +7175,8 @@
+@@ -6431,8 +7637,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -9187,7 +10713,23 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6481,9 +7225,10 @@
+@@ -6455,8 +7661,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
+@@ -6481,9 +7692,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9199,7 +10741,23 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6521,6 +7266,7 @@
+@@ -6493,8 +7705,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
+@@ -6521,6 +7738,7 @@
ac_preproc_ok=:
break
fi
@@ -9207,7 +10765,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6547,16 +7293,15 @@
+@@ -6547,16 +7765,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -9228,17 +10786,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'
-@@ -6609,7 +7354,9 @@
+@@ -6583,24 +7800,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
+@@ -6609,8 +7838,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"
-@@ -6623,22 +7370,21 @@
+ ac_ext=c
+@@ -6623,22 +7854,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9267,12 +10872,13 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6654,36 +7400,36 @@
+@@ -6654,36 +7884,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
-fi;
+fi
++
@@ -9280,7 +10886,6 @@
- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
-+
+ # Check whether --enable-new_ldflags was given.
if test "${enable_new_ldflags+set}" = set; then
- enableval="$enable_new_ldflags"
@@ -9314,17 +10919,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'
-@@ -6736,7 +7482,9 @@
+@@ -6710,24 +7940,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
+@@ -6736,8 +7978,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"
-@@ -6750,29 +7498,28 @@
+ ac_ext=c
+@@ -6750,29 +7994,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9362,17 +11014,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'
-@@ -6825,7 +7572,9 @@
+@@ -6799,24 +8042,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
+@@ -6825,8 +8080,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"
-@@ -6839,13 +7588,13 @@
+ ac_ext=c
+@@ -6839,13 +8096,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9390,7 +11089,7 @@
:
fi
-@@ -6855,13 +7604,13 @@
+@@ -6855,13 +8112,13 @@
@@ -9408,7 +11107,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6874,13 +7623,13 @@
+@@ -6874,13 +8131,13 @@
@@ -9426,31 +11125,38 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6891,198 +7640,19 @@
+@@ -6891,259 +8148,80 @@
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
@@ -9459,7 +11165,14 @@
-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 ()
-{
@@ -9494,7 +11207,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
@@ -9504,24 +11217,67 @@
-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
--
+
-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-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
+
+
++# 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'
@@ -9609,67 +11365,84 @@
-
- ;;
- 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=""
-@@ -7097,10 +7667,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 ;;
-@@ -7119,12 +7688,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 ;;
-@@ -7143,7 +7712,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
-+
-@@ -7152,11 +7722,11 @@
+@@ -7152,11 +8230,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -9685,7 +11458,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7177,8 +7747,8 @@
+@@ -7177,8 +8255,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -9696,7 +11469,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7194,14 +7764,13 @@
+@@ -7194,14 +8272,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -9715,22 +11488,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7220,10 +7789,11 @@
+@@ -7220,10 +8297,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
-@@ -7247,7 +7817,7 @@
+@@ -7247,7 +8325,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
@@ -9739,7 +11512,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7276,37 +7846,184 @@
+@@ -7276,37 +8354,184 @@
fi
SED=$lt_cv_path_SED
@@ -9747,10 +11520,7 @@
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
@@ -9760,11 +11530,8 @@
+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'
++ 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
@@ -9797,7 +11564,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
@@ -9820,35 +11587,27 @@
+ { { 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; }
+ GREP="$ac_cv_path_GREP"
+
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- with_gnu_ld=no
--fi;
--ac_prog=ld
--if test "$GCC" = yes; then
++else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -9856,8 +11615,11 @@
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9890,7 +11652,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
@@ -9917,7 +11679,10 @@
+
+else
+ ac_cv_path_EGREP=$EGREP
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+
+
+ fi
@@ -9925,18 +11690,22 @@
+{ 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
+ 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
@@ -9945,7 +11714,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7335,11 +8052,11 @@
+@@ -7335,11 +8560,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9961,7 +11730,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7352,7 +8069,7 @@
+@@ -7352,7 +8577,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,
@@ -9970,7 +11739,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'*)
-@@ -7372,21 +8089,21 @@
+@@ -7372,21 +8597,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9999,7 +11768,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7396,29 +8113,38 @@
+@@ -7396,29 +8621,38 @@
;;
esac
fi
@@ -10046,7 +11815,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7426,56 +8152,63 @@
+@@ -7426,56 +8660,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -10144,7 +11913,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7502,44 +8235,36 @@
+@@ -7502,44 +8743,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -10199,7 +11968,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7555,7 +8280,7 @@
+@@ -7555,7 +8788,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -10208,7 +11977,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
-@@ -7571,43 +8296,27 @@
+@@ -7571,43 +8804,27 @@
esac
;;
@@ -10265,7 +12034,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
-@@ -7626,32 +8335,22 @@
+@@ -7626,32 +8843,22 @@
;;
openbsd*)
@@ -10301,7 +12070,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]'
-@@ -7672,17 +8371,20 @@
+@@ -7672,17 +8879,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -10325,7 +12094,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
-@@ -7691,14 +8393,17 @@
+@@ -7691,14 +8901,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -10346,16 +12115,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7725,7 +8430,7 @@
+@@ -7725,7 +8938,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7728 "configure"' > conftest.$ac_ext
-+ echo '#line 8433 "configure"' > conftest.$ac_ext
++ echo '#line 8941 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7768,14 +8473,13 @@
+@@ -7768,14 +8981,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -10372,7 +12141,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7787,7 +8491,6 @@
+@@ -7787,7 +8999,6 @@
esac
;;
*64-bit*)
@@ -10380,7 +12149,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7812,8 +8515,8 @@
+@@ -7812,8 +9023,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -10391,18 +12160,65 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7865,8 +8568,9 @@
+@@ -7839,24 +9050,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
+@@ -7865,9 +9088,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
-@@ -7876,13 +8580,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7876,13 +9100,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -10438,7 +12254,7 @@
esac
-@@ -7890,8 +8614,8 @@
+@@ -7890,8 +9134,8 @@
@@ -10449,18 +12265,65 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7941,8 +8665,9 @@
+@@ -7915,24 +9159,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
+@@ -7941,9 +9197,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
-@@ -7999,6 +8724,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7999,6 +9256,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -10468,7 +12331,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8018,8 +8744,8 @@
+@@ -8018,18 +9276,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -10479,7 +12342,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -8042,12 +8768,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
+@@ -8042,12 +9309,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -10497,7 +12383,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8070,9 +8798,9 @@
+@@ -8070,9 +9339,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10510,15 +12396,61 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8112,12 +8840,14 @@
+@@ -8086,24 +9355,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
+@@ -8112,12 +9393,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
@@ -10528,7 +12460,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8132,18 +8862,19 @@
+@@ -8132,18 +9415,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10556,17 +12488,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8180,15 +8911,16 @@
+@@ -8154,24 +9438,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
+@@ -8180,15 +9476,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; }
@@ -10578,7 +12556,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8222,9 +8954,10 @@
+@@ -8197,8 +9494,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
+@@ -8222,9 +9524,10 @@
ac_header_preproc=no
fi
@@ -10591,7 +12585,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8248,25 +8981,19 @@
+@@ -8248,25 +9551,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;}
@@ -10624,12 +12618,64 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8278,17 +9005,258 @@
+@@ -8278,222 +9575,541 @@
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
@@ -10642,21 +12688,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:8373:" \
+- "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
@@ -10666,16 +12779,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
@@ -10688,33 +12826,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
@@ -10728,15 +12908,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
@@ -10744,7 +12926,12 @@
+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
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -10778,8 +12965,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
@@ -10817,8 +13009,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
@@ -10869,104 +13066,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
-@@ -8301,36 +9269,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
-@@ -8343,48 +9313,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
@@ -10982,92 +13172,178 @@
+esac
+ F77=$ac_ct_F77
+ fi
- fi
-
-
- # Provide some information about the compiler.
--echo "$as_me:8373:" \
-- "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); }
-@@ -8394,8 +9379,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
-@@ -8434,20 +9419,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
-@@ -8484,13 +9470,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
-@@ -8519,13 +9506,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
+@@ -8519,13 +10135,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -11084,7 +13360,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8554,20 +9541,70 @@
+@@ -8554,20 +10170,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -11161,7 +13437,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.
-@@ -8578,19 +9615,19 @@
+@@ -8578,19 +10244,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -11187,7 +13463,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8604,9 +9641,6 @@
+@@ -8604,9 +10270,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -11197,7 +13473,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'"
-@@ -8628,14 +9662,30 @@
+@@ -8628,14 +10291,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'"
;;
@@ -11230,7 +13506,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8653,14 +9703,17 @@
+@@ -8653,14 +10332,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -11250,7 +13526,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8778,15 +9831,15 @@
+@@ -8778,15 +10460,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
@@ -11272,7 +13548,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8800,8 +9853,8 @@
+@@ -8800,8 +10482,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -11283,7 +13559,7 @@
objdir=$lt_cv_objdir
-@@ -8822,7 +9875,7 @@
+@@ -8822,7 +10504,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -11292,7 +13568,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8842,7 +9895,7 @@
+@@ -8842,7 +10524,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -11301,7 +13577,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8852,8 +9905,8 @@
+@@ -8852,8 +10534,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
@@ -11312,7 +13588,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8866,32 +9919,34 @@
+@@ -8866,32 +10548,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11354,7 +13630,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8904,27 +9959,41 @@
+@@ -8904,27 +10588,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11403,7 +13679,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8932,8 +10001,8 @@
+@@ -8932,8 +10630,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
@@ -11414,7 +13690,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8946,32 +10015,34 @@
+@@ -8946,32 +10644,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11456,7 +13732,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8984,27 +10055,41 @@
+@@ -8984,27 +10684,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11505,7 +13781,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -9012,8 +10097,8 @@
+@@ -9012,8 +10726,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
@@ -11516,7 +13792,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9026,32 +10111,34 @@
+@@ -9026,32 +10740,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11558,7 +13834,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9064,27 +10151,41 @@
+@@ -9064,27 +10780,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11607,7 +13883,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9099,6 +10200,7 @@
+@@ -9099,6 +10829,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -11615,7 +13891,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9118,21 +10220,32 @@
+@@ -9118,21 +10849,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -11652,7 +13928,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9152,7 +10265,7 @@
+@@ -9152,7 +10894,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11661,7 +13937,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
-@@ -9184,17 +10297,17 @@
+@@ -9184,17 +10926,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11685,7 +13961,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9214,7 +10327,7 @@
+@@ -9214,7 +10956,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -11694,7 +13970,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
-@@ -9246,11 +10359,11 @@
+@@ -9246,11 +10988,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11710,7 +13986,7 @@
fi
else
-@@ -9265,21 +10378,21 @@
+@@ -9265,21 +11007,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -11739,7 +14015,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9309,68 +10422,25 @@
+@@ -9309,68 +11051,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11823,7 +14099,7 @@
## CAVEAT EMPTOR:
-@@ -9384,8 +10454,8 @@
+@@ -9384,8 +11083,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11834,7 +14110,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9399,26 +10469,28 @@
+@@ -9399,26 +11098,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 \
@@ -11843,12 +14119,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9405: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10475: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11104: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9409: \$? = $ac_status" >&5
-+ echo "$as_me:10479: \$? = $ac_status" >&5
++ echo "$as_me:11108: \$? = $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
@@ -11870,7 +14146,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"
-@@ -9432,8 +10504,8 @@
+@@ -9432,8 +11133,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11881,7 +14157,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9471,6 +10543,11 @@
+@@ -9471,6 +11172,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -11893,7 +14169,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9487,7 +10564,7 @@
+@@ -9487,7 +11193,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11902,7 +14178,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9513,6 +10590,16 @@
+@@ -9513,6 +11219,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11919,7 +14195,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9524,7 +10611,7 @@
+@@ -9524,7 +11240,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.
@@ -11928,7 +14204,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9547,13 +10634,20 @@
+@@ -9547,13 +11263,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -11951,7 +14227,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9568,15 +10662,15 @@
+@@ -9568,15 +11291,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -11973,7 +14249,7 @@
;;
sunos4*)
-@@ -9585,7 +10679,7 @@
+@@ -9585,7 +11308,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -11982,7 +14258,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9598,6 +10692,17 @@
+@@ -9598,6 +11321,17 @@
fi
;;
@@ -12000,7 +14276,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9609,16 +10714,16 @@
+@@ -9609,16 +11343,16 @@
esac
fi
@@ -12021,7 +14297,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9632,26 +10737,28 @@
+@@ -9632,26 +11366,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 \
@@ -12030,12 +14306,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9638: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10743: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11372: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9642: \$? = $ac_status" >&5
-+ echo "$as_me:10747: \$? = $ac_status" >&5
++ echo "$as_me:11376: \$? = $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
@@ -12057,7 +14333,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9664,7 +10771,7 @@
+@@ -9664,7 +11400,7 @@
fi
fi
@@ -12066,7 +14342,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9674,8 +10781,50 @@
+@@ -9674,8 +11410,50 @@
;;
esac
@@ -12119,7 +14395,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9686,60 +10835,58 @@
+@@ -9686,60 +11464,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -12141,12 +14417,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9705: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10847: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11476: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9709: \$? = $ac_status" >&5
-+ echo "$as_me:10851: \$? = $ac_status" >&5
++ echo "$as_me:11480: \$? = $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
@@ -12198,7 +14474,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;}
-@@ -9749,8 +10896,8 @@
+@@ -9749,8 +11525,8 @@
need_locks=no
fi
@@ -12209,11 +14485,10 @@
runpath_var=
allow_undefined_flag=
-@@ -9788,7 +10935,17 @@
+@@ -9788,6 +11564,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
--
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+ case $cc_temp in
@@ -12224,11 +14499,10 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
+
case $host_os in
cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -9798,6 +10955,10 @@
+@@ -9798,6 +11584,10 @@
with_gnu_ld=no
fi
;;
@@ -12239,7 +14513,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9808,6 +10969,27 @@
+@@ -9808,6 +11598,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -12267,7 +14541,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9845,7 +11027,7 @@
+@@ -9845,7 +11656,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -12276,7 +14550,7 @@
else
ld_shlibs=no
fi
-@@ -9855,13 +11037,13 @@
+@@ -9855,13 +11666,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'
@@ -12293,7 +14567,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
-@@ -9870,23 +11052,70 @@
+@@ -9870,23 +11681,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -12369,7 +14643,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9900,13 +11129,40 @@
+@@ -9900,13 +11758,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12412,7 +14686,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9916,24 +11172,19 @@
+@@ -9916,24 +11801,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12444,7 +14718,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9945,7 +11196,7 @@
+@@ -9945,7 +11825,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -12453,7 +14727,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9967,9 +11218,21 @@
+@@ -9967,9 +11847,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
@@ -12477,7 +14751,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9986,7 +11249,7 @@
+@@ -9986,7 +11878,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -12486,7 +14760,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`
-@@ -10005,8 +11268,12 @@
+@@ -10005,8 +11897,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -12499,7 +14773,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10014,22 +11281,23 @@
+@@ -10014,22 +11910,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12530,14 +14804,60 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10076,19 +11344,20 @@
+@@ -10045,24 +11942,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
+@@ -10076,19 +11985,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
@@ -12555,17 +14875,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10138,7 +11407,9 @@
+@@ -10107,24 +12017,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
+@@ -10138,8 +12060,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
-@@ -10148,13 +11419,11 @@
+
+@@ -10148,13 +12072,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -12582,7 +14949,7 @@
fi
fi
;;
-@@ -10167,7 +11436,7 @@
+@@ -10167,7 +12089,7 @@
ld_shlibs=no
;;
@@ -12591,7 +14958,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10177,13 +11446,13 @@
+@@ -10177,13 +12099,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -12608,7 +14975,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.
-@@ -10193,52 +11462,52 @@
+@@ -10193,52 +12115,52 @@
;;
darwin* | rhapsody*)
@@ -12701,7 +15068,7 @@
fi
;;
-@@ -10272,8 +11541,8 @@
+@@ -10272,8 +12194,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12712,7 +15079,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10281,7 +11550,7 @@
+@@ -10281,7 +12203,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -12721,7 +15088,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
-@@ -10295,47 +11564,62 @@
+@@ -10295,47 +12217,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -12790,25 +15157,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
+- hardcode_direct=no
+- hardcode_shlibpath_var=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=no
hardcode_shlibpath_var=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_direct=no
-- hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10349,7 +11633,7 @@
+@@ -10349,7 +12286,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12817,7 +15184,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'
-@@ -10359,7 +11643,7 @@
+@@ -10359,7 +12296,7 @@
link_all_deplibs=yes
;;
@@ -12826,7 +15193,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10382,7 +11666,8 @@
+@@ -10382,7 +12319,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
@@ -12836,7 +15203,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10392,7 +11677,7 @@
+@@ -10392,7 +12330,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -12845,7 +15212,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10403,14 +11688,14 @@
+@@ -10403,14 +12341,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -12862,7 +15229,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'
-@@ -10422,13 +11707,13 @@
+@@ -10422,13 +12360,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -12878,7 +15245,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10436,21 +11721,15 @@
+@@ -10436,21 +12374,15 @@
hardcode_libdir_separator=:
;;
@@ -12904,7 +15271,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'
-@@ -10459,8 +11738,18 @@
+@@ -10459,8 +12391,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12925,7 +15292,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10469,7 +11758,7 @@
+@@ -10469,7 +12411,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.
@@ -12934,7 +15301,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10517,36 +11806,45 @@
+@@ -10517,36 +12459,45 @@
fi
;;
@@ -13001,7 +15368,7 @@
;;
uts4*)
-@@ -10561,15 +11859,10 @@
+@@ -10561,15 +12512,10 @@
esac
fi
@@ -13019,7 +15386,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10587,8 +11880,8 @@
+@@ -10587,8 +12533,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.
@@ -13030,7 +15397,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10602,6 +11895,7 @@
+@@ -10602,6 +12548,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -13038,7 +15405,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10624,20 +11918,20 @@
+@@ -10624,20 +12571,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -13064,7 +15431,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10647,7 +11941,20 @@
+@@ -10647,7 +12594,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13086,7 +15453,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10712,7 +12019,7 @@
+@@ -10712,7 +12672,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13095,7 +15462,7 @@
;;
beos*)
-@@ -10721,7 +12028,7 @@
+@@ -10721,7 +12681,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13104,7 +15471,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10737,7 +12044,7 @@
+@@ -10737,7 +12697,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13113,7 +15480,7 @@
need_version=no
need_lib_prefix=no
-@@ -10749,7 +12056,8 @@
+@@ -10749,7 +12709,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13123,7 +15490,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10779,7 +12087,7 @@
+@@ -10779,7 +12740,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13132,7 +15499,7 @@
;;
esac
;;
-@@ -10802,7 +12110,7 @@
+@@ -10802,7 +12763,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13141,7 +15508,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"`
-@@ -10825,20 +12133,17 @@
+@@ -10825,20 +12786,17 @@
dynamic_linker=no
;;
@@ -13173,7 +15540,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10856,14 +12161,19 @@
+@@ -10856,14 +12814,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13195,7 +15562,7 @@
esac
;;
-@@ -10883,9 +12193,9 @@
+@@ -10883,9 +12846,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13207,7 +15574,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10900,7 +12210,7 @@
+@@ -10900,7 +12863,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13216,7 +15583,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10911,7 +12221,7 @@
+@@ -10911,7 +12874,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13225,7 +15592,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10923,6 +12233,18 @@
+@@ -10923,6 +12886,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13244,7 +15611,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10966,29 +12288,26 @@
+@@ -10966,29 +12941,26 @@
;;
# This must be Linux ELF.
@@ -13281,7 +15648,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,
-@@ -10998,6 +12317,18 @@
+@@ -10998,6 +12970,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -13300,7 +15667,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11007,7 +12338,7 @@
+@@ -11007,7 +12991,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -13309,7 +15676,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11035,8 +12366,13 @@
+@@ -11035,8 +13019,13 @@
openbsd*)
version_type=sunos
@@ -13324,7 +15691,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
-@@ -11056,7 +12392,7 @@
+@@ -11056,7 +13045,7 @@
os2*)
libname_spec='$name'
@@ -13333,7 +15700,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11074,13 +12410,6 @@
+@@ -11074,13 +13063,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -13347,7 +15714,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11106,7 +12435,7 @@
+@@ -11106,7 +13088,7 @@
need_version=yes
;;
@@ -13356,7 +15723,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'
-@@ -11139,6 +12468,29 @@
+@@ -11139,6 +13121,29 @@
fi
;;
@@ -13386,7 +15753,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11150,16 +12502,21 @@
+@@ -11150,16 +13155,21 @@
dynamic_linker=no
;;
esac
@@ -13414,7 +15781,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11179,8 +12536,8 @@
+@@ -11179,8 +13189,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -13425,7 +15792,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11193,29 +12550,29 @@
+@@ -11193,29 +13203,29 @@
striplib=
old_striplib=
@@ -13465,7 +15832,7 @@
;;
esac
fi
-@@ -11247,8 +12604,8 @@
+@@ -11247,8 +13257,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -13476,7 +15843,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11261,17 +12618,17 @@
+@@ -11261,40 +13271,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13498,15 +15865,59 @@
;
return 0;
}
-@@ -11303,14 +12660,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
+@@ -11303,14 +13325,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
@@ -13517,7 +15928,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11324,8 +12682,8 @@
+@@ -11324,8 +13347,8 @@
;;
*)
@@ -13528,7 +15939,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11352,30 +12710,24 @@
+@@ -11352,53 +13375,59 @@
#undef shl_load
@@ -13564,15 +15975,59 @@
;
return 0;
}
-@@ -11407,18 +12759,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
+@@ -11407,18 +13436,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
@@ -13589,7 +16044,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11431,17 +12784,17 @@
+@@ -11431,40 +13461,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13611,15 +16066,59 @@
;
return 0;
}
-@@ -11473,19 +12826,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
+@@ -11473,19 +13515,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
@@ -13637,7 +16136,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11512,30 +12866,24 @@
+@@ -11512,53 +13555,59 @@
#undef dlopen
@@ -13673,15 +16172,59 @@
;
return 0;
}
-@@ -11567,18 +12915,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
+@@ -11567,18 +13616,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
@@ -13698,7 +16241,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11591,17 +12940,17 @@
+@@ -11591,40 +13641,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13720,15 +16263,59 @@
;
return 0;
}
-@@ -11633,19 +12982,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
+@@ -11633,19 +13695,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
@@ -13746,7 +16333,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11658,17 +13008,17 @@
+@@ -11658,40 +13721,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13768,15 +16355,59 @@
;
return 0;
}
-@@ -11700,19 +13050,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
+@@ -11700,19 +13775,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
@@ -13794,7 +16425,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11725,17 +13076,17 @@
+@@ -11725,40 +13801,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13816,15 +16447,59 @@
;
return 0;
}
-@@ -11767,14 +13118,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
+@@ -11767,14 +13855,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
@@ -13835,7 +16510,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11809,13 +13161,13 @@
+@@ -11809,13 +13898,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -13852,16 +16527,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11825,7 +13177,7 @@
+@@ -11825,7 +13914,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11828 "configure"
-+#line 13180 "configure"
++#line 13917 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11882,6 +13234,8 @@
+@@ -11882,6 +13971,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13870,7 +16545,7 @@
exit (status);
}
-@@ -11891,12 +13245,12 @@
+@@ -11891,12 +13982,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13885,7 +16560,7 @@
esac
else :
# compilation failed
-@@ -11907,13 +13261,13 @@
+@@ -11907,13 +13998,13 @@
fi
@@ -13904,16 +16579,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11923,7 +13277,7 @@
+@@ -11923,7 +14014,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11926 "configure"
-+#line 13280 "configure"
++#line 14017 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11980,6 +13334,8 @@
+@@ -11980,6 +14071,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -13922,7 +16597,7 @@
exit (status);
}
-@@ -11989,12 +13345,12 @@
+@@ -11989,12 +14082,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -13937,7 +16612,7 @@
esac
else :
# compilation failed
-@@ -12005,8 +13361,8 @@
+@@ -12005,8 +14098,8 @@
fi
@@ -13948,7 +16623,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12027,19 +13383,19 @@
+@@ -12027,19 +14120,19 @@
fi
@@ -13976,7 +16651,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12048,58 +13404,21 @@
+@@ -12048,58 +14141,21 @@
fi
;;
@@ -14042,7 +16717,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12114,7 +13433,8 @@
+@@ -12114,7 +14170,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.
@@ -14052,7 +16727,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 \
-@@ -12228,11 +13548,11 @@
+@@ -12228,11 +14285,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -14066,7 +16741,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12262,6 +13582,12 @@
+@@ -12262,6 +14319,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14079,7 +16754,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12273,6 +13599,9 @@
+@@ -12273,6 +14336,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14089,7 +16764,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12292,7 +13621,7 @@
+@@ -12292,7 +14358,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14098,7 +16773,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12323,7 +13652,7 @@
+@@ -12323,7 +14389,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14107,7 +16782,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12338,7 +13667,7 @@
+@@ -12338,7 +14404,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -14116,7 +16791,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12565,7 +13894,10 @@
+@@ -12565,7 +14631,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.
@@ -14128,7 +16803,7 @@
fi
-@@ -12578,11 +13910,11 @@
+@@ -12578,11 +14647,11 @@
CC="$lt_save_CC"
@@ -14144,7 +16819,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12600,6 +13932,9 @@
+@@ -12600,6 +14669,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -14154,7 +16829,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12630,8 +13965,10 @@
+@@ -12630,8 +14702,10 @@
case $tagname in
CXX)
@@ -14167,7 +16842,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'
-@@ -12650,6 +13987,7 @@
+@@ -12650,6 +14724,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -14175,7 +16850,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12667,7 +14005,7 @@
+@@ -12667,7 +14742,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -14184,7 +16859,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12677,17 +14015,34 @@
+@@ -12677,17 +14752,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -14220,7 +16895,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12698,18 +14053,27 @@
+@@ -12698,18 +14790,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -14251,7 +16926,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12723,18 +14087,18 @@
+@@ -12723,18 +14824,18 @@
# Set up default GNU C++ configuration
@@ -14276,7 +16951,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12763,11 +14127,11 @@
+@@ -12763,11 +14864,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14292,7 +16967,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12780,7 +14144,7 @@
+@@ -12780,7 +14881,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,
@@ -14301,7 +16976,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'*)
-@@ -12800,21 +14164,21 @@
+@@ -12800,21 +14901,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14330,7 +17005,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12824,8 +14188,8 @@
+@@ -12824,8 +14925,8 @@
;;
esac
fi
@@ -14341,7 +17016,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12833,8 +14197,8 @@
+@@ -12833,8 +14934,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
@@ -14352,7 +17027,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12860,7 +14224,7 @@
+@@ -12860,7 +14961,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.
@@ -14361,7 +17036,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12875,8 +14239,8 @@
+@@ -12875,8 +14976,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -14372,7 +17047,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12891,8 +14255,23 @@
+@@ -12891,8 +14992,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -14398,7 +17073,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12909,7 +14288,7 @@
+@@ -12909,7 +15025,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -14407,7 +17082,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`
-@@ -12928,8 +14307,12 @@
+@@ -12928,8 +15044,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -14420,7 +17095,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12938,15 +14321,16 @@
+@@ -12938,15 +15058,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -14441,14 +17116,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.
-@@ -12999,20 +14383,21 @@
+@@ -12968,24 +15089,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
+@@ -12999,20 +15132,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
@@ -14466,17 +17187,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13062,7 +14447,9 @@
+@@ -13031,24 +15165,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
+@@ -13062,8 +15208,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
-@@ -13072,16 +14459,26 @@
+
+@@ -13072,16 +15220,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -14508,7 +17276,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13095,12 +14492,12 @@
+@@ -13095,12 +15253,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'
@@ -14523,7 +17291,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
-@@ -13109,70 +14506,81 @@
+@@ -13109,70 +15267,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14657,7 +17425,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13183,14 +14591,14 @@
+@@ -13183,14 +15352,14 @@
;;
esac
;;
@@ -14674,7 +17442,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13207,12 +14615,12 @@
+@@ -13207,12 +15376,12 @@
# location of the library.
case $cc_basename in
@@ -14690,7 +17458,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13221,11 +14629,11 @@
+@@ -13221,11 +15390,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.
@@ -14704,7 +17472,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13235,33 +14643,22 @@
+@@ -13235,33 +15404,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -14745,7 +17513,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13272,17 +14669,20 @@
+@@ -13272,17 +15430,20 @@
esac
case $cc_basename in
@@ -14772,7 +17540,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13298,12 +14698,15 @@
+@@ -13298,12 +15459,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -14792,7 +17560,7 @@
;;
esac
fi
-@@ -13314,11 +14717,25 @@
+@@ -13314,11 +15478,25 @@
;;
esac
;;
@@ -14820,7 +17588,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13329,9 +14746,9 @@
+@@ -13329,9 +15507,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -14832,7 +17600,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13340,16 +14757,16 @@
+@@ -13340,16 +15518,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -14853,7 +17621,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13367,20 +14784,44 @@
+@@ -13367,20 +15545,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -14904,7 +17672,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13408,7 +14849,7 @@
+@@ -13408,7 +15610,7 @@
;;
mvs*)
case $cc_basename in
@@ -14913,7 +17681,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13418,7 +14859,7 @@
+@@ -13418,7 +15620,7 @@
;;
esac
;;
@@ -14922,7 +17690,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=
-@@ -13429,15 +14870,31 @@
+@@ -13429,15 +15631,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::"'
;;
@@ -14956,7 +17724,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13447,14 +14904,14 @@
+@@ -13447,14 +15665,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -14974,7 +17742,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13472,7 +14929,7 @@
+@@ -13472,7 +15690,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -14983,7 +17751,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13491,13 +14948,13 @@
+@@ -13491,13 +15709,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -14999,7 +17767,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13506,17 +14963,17 @@
+@@ -13506,17 +15724,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -15021,7 +17789,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13535,7 +14992,7 @@
+@@ -13535,7 +15753,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15030,7 +17798,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13556,27 +15013,14 @@
+@@ -13556,27 +15774,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -15060,7 +17828,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13589,36 +15033,33 @@
+@@ -13589,36 +15794,33 @@
;;
solaris*)
case $cc_basename in
@@ -15109,7 +17877,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13626,9 +15067,9 @@
+@@ -13626,9 +15828,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -15121,7 +17889,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13638,9 +15079,9 @@
+@@ -13638,9 +15840,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
@@ -15133,7 +17901,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13649,9 +15090,9 @@
+@@ -13649,9 +15851,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -15145,7 +17913,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13664,12 +15105,63 @@
+@@ -13664,12 +15866,63 @@
;;
esac
;;
@@ -15211,7 +17979,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13689,8 +15181,8 @@
+@@ -13689,8 +15942,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -15222,7 +17990,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13726,7 +15218,7 @@
+@@ -13726,7 +15979,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.
@@ -15231,7 +17999,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13766,7 +15258,7 @@
+@@ -13766,7 +16019,7 @@
fi
;;
@@ -15240,7 +18008,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13802,6 +15294,29 @@
+@@ -13802,6 +16055,29 @@
$rm -f confest.$objext
@@ -15270,7 +18038,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13810,8 +15325,8 @@
+@@ -13810,8 +16086,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -15281,7 +18049,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13849,6 +15364,10 @@
+@@ -13849,6 +16125,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -15292,7 +18060,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13857,7 +15376,7 @@
+@@ -13857,7 +16137,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -15301,7 +18069,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13882,18 +15401,28 @@
+@@ -13882,18 +16162,28 @@
;;
chorus*)
case $cc_basename in
@@ -15333,7 +18101,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13901,22 +15430,22 @@
+@@ -13901,22 +16191,22 @@
;;
esac
;;
@@ -15362,7 +18130,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13929,9 +15458,13 @@
+@@ -13929,9 +16219,13 @@
;;
esac
;;
@@ -15377,7 +18145,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13940,20 +15473,26 @@
+@@ -13940,20 +16234,26 @@
;;
esac
;;
@@ -15408,7 +18176,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13970,25 +15509,25 @@
+@@ -13970,25 +16270,25 @@
;;
mvs*)
case $cc_basename in
@@ -15439,7 +18207,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -14002,24 +15541,15 @@
+@@ -14002,24 +16302,15 @@
;;
psos*)
;;
@@ -15466,7 +18234,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14029,12 +15559,12 @@
+@@ -14029,12 +16320,12 @@
;;
sunos4*)
case $cc_basename in
@@ -15481,7 +18249,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14044,7 +15574,7 @@
+@@ -14044,7 +16335,7 @@
;;
tandem*)
case $cc_basename in
@@ -15490,7 +18258,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14052,7 +15582,14 @@
+@@ -14052,7 +16343,14 @@
;;
esac
;;
@@ -15506,7 +18274,7 @@
;;
vxworks*)
;;
-@@ -14062,16 +15599,16 @@
+@@ -14062,16 +16360,16 @@
esac
fi
@@ -15527,7 +18295,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14085,26 +15622,28 @@
+@@ -14085,26 +16383,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 \
@@ -15536,12 +18304,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14091: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15628: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14095: \$? = $ac_status" >&5
-+ echo "$as_me:15632: \$? = $ac_status" >&5
++ echo "$as_me:16393: \$? = $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
@@ -15563,7 +18331,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14117,7 +15656,7 @@
+@@ -14117,7 +16417,7 @@
fi
fi
@@ -15572,7 +18340,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14127,8 +15666,50 @@
+@@ -14127,8 +16427,50 @@
;;
esac
@@ -15625,7 +18393,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14139,60 +15720,58 @@
+@@ -14139,60 +16481,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -15647,12 +18415,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14158: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15732: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16493: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14162: \$? = $ac_status" >&5
-+ echo "$as_me:15736: \$? = $ac_status" >&5
++ echo "$as_me:16497: \$? = $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
@@ -15704,7 +18472,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;}
-@@ -14202,8 +15781,8 @@
+@@ -14202,8 +16542,8 @@
need_locks=no
fi
@@ -15715,7 +18483,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14220,22 +15799,20 @@
+@@ -14220,22 +16560,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -15744,7 +18512,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14253,8 +15830,8 @@
+@@ -14253,8 +16591,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.
@@ -15755,7 +18523,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14268,6 +15845,7 @@
+@@ -14268,6 +16606,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -15763,7 +18531,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14290,20 +15868,20 @@
+@@ -14290,20 +16629,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15789,7 +18557,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14313,7 +15891,20 @@
+@@ -14313,7 +16652,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15811,7 +18579,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14378,7 +15969,7 @@
+@@ -14378,7 +16730,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15820,7 +18588,7 @@
;;
beos*)
-@@ -14387,7 +15978,7 @@
+@@ -14387,7 +16739,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15829,7 +18597,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14403,7 +15994,7 @@
+@@ -14403,7 +16755,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15838,7 +18606,7 @@
need_version=no
need_lib_prefix=no
-@@ -14415,7 +16006,8 @@
+@@ -14415,7 +16767,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15848,7 +18616,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14445,7 +16037,7 @@
+@@ -14445,7 +16798,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15857,7 +18625,7 @@
;;
esac
;;
-@@ -14468,7 +16060,7 @@
+@@ -14468,7 +16821,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15866,7 +18634,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"`
-@@ -14491,20 +16083,17 @@
+@@ -14491,20 +16844,17 @@
dynamic_linker=no
;;
@@ -15898,7 +18666,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14522,14 +16111,19 @@
+@@ -14522,14 +16872,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15920,7 +18688,7 @@
esac
;;
-@@ -14549,9 +16143,9 @@
+@@ -14549,9 +16904,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15932,7 +18700,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14566,7 +16160,7 @@
+@@ -14566,7 +16921,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15941,7 +18709,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14577,7 +16171,7 @@
+@@ -14577,7 +16932,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15950,7 +18718,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14589,6 +16183,18 @@
+@@ -14589,6 +16944,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15969,7 +18737,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14632,29 +16238,26 @@
+@@ -14632,29 +16999,26 @@
;;
# This must be Linux ELF.
@@ -16006,11 +18774,10 @@
# 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,
-@@ -14664,7 +16267,19 @@
+@@ -14664,6 +17028,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--netbsd*)
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -16023,11 +18790,10 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-+netbsd*)
+ netbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-@@ -14673,7 +16288,7 @@
+@@ -14673,7 +17049,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16036,7 +18802,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14701,8 +16316,13 @@
+@@ -14701,8 +17077,13 @@
openbsd*)
version_type=sunos
@@ -16051,7 +18817,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
-@@ -14722,7 +16342,7 @@
+@@ -14722,7 +17103,7 @@
os2*)
libname_spec='$name'
@@ -16060,7 +18826,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14740,13 +16360,6 @@
+@@ -14740,13 +17121,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16074,7 +18840,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14772,7 +16385,7 @@
+@@ -14772,7 +17146,7 @@
need_version=yes
;;
@@ -16083,17 +18849,21 @@
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'
-@@ -14805,6 +16418,29 @@
+@@ -14805,27 +17179,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'
@@ -16110,10 +18880,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}'
-@@ -14816,16 +16452,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
@@ -16141,7 +18915,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14845,8 +16486,8 @@
+@@ -14845,8 +17247,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -16152,7 +18926,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14857,1155 +16498,330 @@
+@@ -14857,1001 +17259,176 @@
enable_fast_install=needless
fi
@@ -16761,9 +19535,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"
@@ -16805,10 +19577,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 \
@@ -16833,9 +19602,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"
@@ -16877,9 +19644,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 \
@@ -16891,75 +19656,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
@@ -16973,19 +19705,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15494 "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
@@ -16995,10 +19721,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
@@ -17020,35 +19743,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
@@ -17070,23 +19782,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
@@ -17102,22 +19803,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15592 "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
@@ -17127,10 +19819,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
@@ -17152,33 +19841,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
@@ -17200,45 +19880,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
-
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-
+-
+-
-# 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
@@ -17398,166 +20064,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
+@@ -15867,7 +17444,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"
+@@ -15882,7 +17459,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 path variable.
--shlibpath_var=$shlibpath_var
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
- # Is shlibpath searched before the hard-coded library search path?
- shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-@@ -16084,7 +16900,10 @@
+ # Do we need the lib prefix for modules?
+@@ -16084,7 +17661,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.
@@ -17569,7 +20099,7 @@
fi
-@@ -16156,29 +16975,55 @@
+@@ -16156,29 +17736,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -17609,19 +20139,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
@@ -17633,7 +20163,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16186,21 +17031,21 @@
+@@ -16186,21 +17792,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -17665,7 +20195,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16209,8 +17054,8 @@
+@@ -16209,8 +17815,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -17676,7 +20206,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16248,6 +17093,11 @@
+@@ -16248,6 +17854,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17688,7 +20218,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16264,7 +17114,7 @@
+@@ -16264,7 +17875,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17697,7 +20227,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16290,6 +17140,16 @@
+@@ -16290,6 +17901,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -17714,7 +20244,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16301,7 +17161,7 @@
+@@ -16301,7 +17922,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.
@@ -17723,7 +20253,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16324,13 +17184,20 @@
+@@ -16324,13 +17945,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17746,7 +20276,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16345,15 +17212,15 @@
+@@ -16345,15 +17973,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17768,7 +20298,7 @@
;;
sunos4*)
-@@ -16362,7 +17229,7 @@
+@@ -16362,7 +17990,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17777,7 +20307,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16375,6 +17242,17 @@
+@@ -16375,6 +18003,17 @@
fi
;;
@@ -17795,7 +20325,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16386,16 +17264,16 @@
+@@ -16386,16 +18025,16 @@
esac
fi
@@ -17816,7 +20346,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16409,26 +17287,28 @@
+@@ -16409,26 +18048,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 \
@@ -17825,12 +20355,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16415: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17293: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18054: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16419: \$? = $ac_status" >&5
-+ echo "$as_me:17297: \$? = $ac_status" >&5
++ echo "$as_me:18058: \$? = $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
@@ -17852,7 +20382,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16441,7 +17321,7 @@
+@@ -16441,7 +18082,7 @@
fi
fi
@@ -17861,12 +20391,13 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16451,8 +17331,50 @@
+@@ -16451,24 +18092,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.
+#
@@ -17874,8 +20405,21 @@
+{ 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
+-
+- # 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_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17911,23 +20455,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
-@@ -16463,60 +17385,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.
+@@ -16476,47 +18152,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 \
@@ -17936,12 +20476,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16482: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17397: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18158: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16486: \$? = $ac_status" >&5
-+ echo "$as_me:17401: \$? = $ac_status" >&5
++ echo "$as_me:18162: \$? = $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
@@ -17993,7 +20533,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;}
-@@ -16526,8 +17446,8 @@
+@@ -16526,8 +18207,8 @@
need_locks=no
fi
@@ -18004,7 +20544,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16565,6 +17485,16 @@
+@@ -16565,6 +18246,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -18021,7 +20561,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16575,6 +17505,10 @@
+@@ -16575,6 +18266,10 @@
with_gnu_ld=no
fi
;;
@@ -18032,7 +20572,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16585,6 +17519,27 @@
+@@ -16585,6 +18280,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -18060,7 +20600,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16622,7 +17577,7 @@
+@@ -16622,7 +18338,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -18069,7 +20609,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16632,13 +17587,13 @@
+@@ -16632,13 +18348,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'
@@ -18086,7 +20626,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
-@@ -16647,23 +17602,70 @@
+@@ -16647,23 +18363,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18163,7 +20703,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16677,13 +17679,40 @@
+@@ -16677,13 +18440,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18206,7 +20746,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16693,24 +17722,19 @@
+@@ -16693,24 +18483,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18238,7 +20778,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16722,7 +17746,7 @@
+@@ -16722,7 +18507,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -18247,7 +20787,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16744,9 +17768,21 @@
+@@ -16744,9 +18529,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
@@ -18271,7 +20811,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16763,7 +17799,7 @@
+@@ -16763,7 +18560,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -18280,7 +20820,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`
-@@ -16782,8 +17818,12 @@
+@@ -16782,8 +18579,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -18293,7 +20833,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16791,22 +17831,23 @@
+@@ -16791,45 +18592,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -18324,14 +20864,58 @@
program main
end
-@@ -16843,19 +17884,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
+@@ -16843,19 +18657,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
@@ -18349,17 +20933,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16895,7 +17937,9 @@
+@@ -16864,24 +18679,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
+@@ -16895,8 +18722,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
-@@ -16905,13 +17949,11 @@
+
+@@ -16905,13 +18734,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -18376,7 +21007,7 @@
fi
fi
;;
-@@ -16924,7 +17966,7 @@
+@@ -16924,7 +18751,7 @@
ld_shlibs_F77=no
;;
@@ -18385,7 +21016,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16934,68 +17976,68 @@
+@@ -16934,68 +18761,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -18498,7 +21129,7 @@
fi
;;
-@@ -17029,8 +18071,8 @@
+@@ -17029,8 +18856,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18509,7 +21140,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17038,7 +18080,7 @@
+@@ -17038,7 +18865,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -18518,7 +21149,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
-@@ -17052,47 +18094,62 @@
+@@ -17052,47 +18879,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -18605,7 +21236,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17106,7 +18163,7 @@
+@@ -17106,7 +18948,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -18614,7 +21245,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'
-@@ -17116,7 +18173,7 @@
+@@ -17116,7 +18958,7 @@
link_all_deplibs_F77=yes
;;
@@ -18623,7 +21254,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
-@@ -17139,7 +18196,8 @@
+@@ -17139,7 +18981,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
@@ -18633,7 +21264,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17149,7 +18207,7 @@
+@@ -17149,7 +18992,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -18642,7 +21273,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17160,14 +18218,14 @@
+@@ -17160,14 +19003,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -18659,7 +21290,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'
-@@ -17179,13 +18237,13 @@
+@@ -17179,13 +19022,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -18675,7 +21306,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17193,21 +18251,15 @@
+@@ -17193,21 +19036,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -18701,7 +21332,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'
-@@ -17216,8 +18268,18 @@
+@@ -17216,8 +19053,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -18722,7 +21353,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17226,7 +18288,7 @@
+@@ -17226,7 +19073,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.
@@ -18731,7 +21362,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17274,36 +18336,45 @@
+@@ -17274,36 +19121,45 @@
fi
;;
@@ -18798,7 +21429,7 @@
;;
uts4*)
-@@ -17318,15 +18389,10 @@
+@@ -17318,15 +19174,10 @@
esac
fi
@@ -18816,7 +21447,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17344,8 +18410,8 @@
+@@ -17344,8 +19195,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.
@@ -18827,7 +21458,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17359,6 +18425,7 @@
+@@ -17359,6 +19210,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -18835,7 +21466,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17381,20 +18448,20 @@
+@@ -17381,20 +19233,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18861,7 +21492,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17404,7 +18471,20 @@
+@@ -17404,7 +19256,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18883,7 +21514,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17469,7 +18549,7 @@
+@@ -17469,7 +19334,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18892,7 +21523,7 @@
;;
beos*)
-@@ -17478,7 +18558,7 @@
+@@ -17478,7 +19343,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18901,7 +21532,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17494,7 +18574,7 @@
+@@ -17494,7 +19359,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18910,7 +21541,7 @@
need_version=no
need_lib_prefix=no
-@@ -17506,7 +18586,8 @@
+@@ -17506,7 +19371,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18920,7 +21551,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17536,7 +18617,7 @@
+@@ -17536,7 +19402,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18929,7 +21560,7 @@
;;
esac
;;
-@@ -17559,7 +18640,7 @@
+@@ -17559,7 +19425,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18938,7 +21569,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"`
-@@ -17582,20 +18663,17 @@
+@@ -17582,20 +19448,17 @@
dynamic_linker=no
;;
@@ -18970,7 +21601,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17613,14 +18691,19 @@
+@@ -17613,14 +19476,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18992,7 +21623,7 @@
esac
;;
-@@ -17640,9 +18723,9 @@
+@@ -17640,9 +19508,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19004,7 +21635,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17657,7 +18740,7 @@
+@@ -17657,7 +19525,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19013,7 +21644,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17668,7 +18751,7 @@
+@@ -17668,7 +19536,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19022,7 +21653,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17680,6 +18763,18 @@
+@@ -17680,6 +19548,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19041,7 +21672,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17723,29 +18818,26 @@
+@@ -17723,29 +19603,26 @@
;;
# This must be Linux ELF.
@@ -19078,7 +21709,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,
-@@ -17755,6 +18847,18 @@
+@@ -17755,6 +19632,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19097,7 +21728,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17764,7 +18868,7 @@
+@@ -17764,7 +19653,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19106,7 +21737,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17792,8 +18896,13 @@
+@@ -17792,8 +19681,13 @@
openbsd*)
version_type=sunos
@@ -19121,7 +21752,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
-@@ -17813,7 +18922,7 @@
+@@ -17813,7 +19707,7 @@
os2*)
libname_spec='$name'
@@ -19130,7 +21761,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17831,13 +18940,6 @@
+@@ -17831,13 +19725,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19144,7 +21775,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17863,7 +18965,7 @@
+@@ -17863,7 +19750,7 @@
need_version=yes
;;
@@ -19153,23 +21784,17 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17896,27 +18998,55 @@
+@@ -17896,6 +19783,29 @@
fi
;;
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -19186,14 +21811,10 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17907,16 +19817,21 @@
dynamic_linker=no
;;
esac
@@ -19221,7 +21842,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17936,8 +19066,8 @@
+@@ -17936,8 +19851,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -19232,7 +21853,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17948,36 +19078,6 @@
+@@ -17948,36 +19863,6 @@
enable_fast_install=needless
fi
@@ -19269,7 +21890,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17992,7 +19092,8 @@
+@@ -17992,7 +19877,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.
@@ -19279,7 +21900,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 \
-@@ -18092,6 +19193,12 @@
+@@ -18092,6 +19978,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -19292,7 +21913,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18103,6 +19210,9 @@
+@@ -18103,6 +19995,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -19302,7 +21923,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18122,7 +19232,7 @@
+@@ -18122,7 +20017,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -19311,7 +21932,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18153,7 +19263,7 @@
+@@ -18153,7 +20048,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19320,7 +21941,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18168,7 +19278,7 @@
+@@ -18168,7 +20063,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -19329,7 +21950,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18370,7 +19480,10 @@
+@@ -18370,7 +20265,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.
@@ -19341,7 +21962,7 @@
fi
-@@ -18391,7 +19504,6 @@
+@@ -18391,7 +20289,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -19349,7 +21970,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18403,26 +19515,55 @@
+@@ -18403,26 +20300,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -19406,7 +22027,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
-@@ -18434,8 +19575,8 @@
+@@ -18434,8 +20360,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -19417,7 +22038,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18449,26 +19590,28 @@
+@@ -18449,26 +20375,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 \
@@ -19426,12 +22047,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18455: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19596: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20381: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18459: \$? = $ac_status" >&5
-+ echo "$as_me:19600: \$? = $ac_status" >&5
++ echo "$as_me:20385: \$? = $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
@@ -19453,7 +22074,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"
-@@ -18482,8 +19625,8 @@
+@@ -18482,8 +20410,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -19464,7 +22085,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18521,6 +19664,11 @@
+@@ -18521,6 +20449,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -19476,7 +22097,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18537,7 +19685,7 @@
+@@ -18537,7 +20470,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19485,7 +22106,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18563,6 +19711,16 @@
+@@ -18563,6 +20496,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -19502,7 +22123,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18574,7 +19732,7 @@
+@@ -18574,7 +20517,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.
@@ -19511,7 +22132,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18597,13 +19755,20 @@
+@@ -18597,13 +20540,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19534,7 +22155,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18618,15 +19783,15 @@
+@@ -18618,15 +20568,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -19556,7 +22177,7 @@
;;
sunos4*)
-@@ -18635,7 +19800,7 @@
+@@ -18635,7 +20585,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -19565,7 +22186,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18648,6 +19813,17 @@
+@@ -18648,6 +20598,17 @@
fi
;;
@@ -19583,7 +22204,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18659,16 +19835,16 @@
+@@ -18659,16 +20620,16 @@
esac
fi
@@ -19604,7 +22225,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18682,26 +19858,28 @@
+@@ -18682,26 +20643,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 \
@@ -19613,12 +22234,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18688: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19864: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20649: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18692: \$? = $ac_status" >&5
-+ echo "$as_me:19868: \$? = $ac_status" >&5
++ echo "$as_me:20653: \$? = $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
@@ -19640,7 +22261,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18714,7 +19892,7 @@
+@@ -18714,7 +20677,7 @@
fi
fi
@@ -19649,7 +22270,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18724,8 +19902,50 @@
+@@ -18724,8 +20687,50 @@
;;
esac
@@ -19702,7 +22323,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18736,60 +19956,58 @@
+@@ -18736,60 +20741,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -19724,12 +22345,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18755: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19968: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20753: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18759: \$? = $ac_status" >&5
-+ echo "$as_me:19972: \$? = $ac_status" >&5
++ echo "$as_me:20757: \$? = $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
@@ -19781,7 +22402,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;}
-@@ -18799,8 +20017,8 @@
+@@ -18799,8 +20802,8 @@
need_locks=no
fi
@@ -19792,7 +22413,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18838,6 +20056,16 @@
+@@ -18838,6 +20841,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -19809,7 +22430,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18848,6 +20076,10 @@
+@@ -18848,6 +20861,10 @@
with_gnu_ld=no
fi
;;
@@ -19820,7 +22441,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18858,6 +20090,27 @@
+@@ -18858,6 +20875,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -19848,7 +22469,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18895,7 +20148,7 @@
+@@ -18895,7 +20933,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -19857,7 +22478,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18905,13 +20158,13 @@
+@@ -18905,13 +20943,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'
@@ -19874,7 +22495,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
-@@ -18920,23 +20173,70 @@
+@@ -18920,23 +20958,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -19951,7 +22572,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18950,13 +20250,40 @@
+@@ -18950,13 +21035,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -19994,7 +22615,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18966,24 +20293,19 @@
+@@ -18966,24 +21078,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20026,7 +22647,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18995,7 +20317,7 @@
+@@ -18995,7 +21102,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -20035,7 +22656,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19017,9 +20339,21 @@
+@@ -19017,9 +21124,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
@@ -20059,7 +22680,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19036,7 +20370,7 @@
+@@ -19036,7 +21155,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -20068,7 +22689,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`
-@@ -19055,8 +20389,12 @@
+@@ -19055,8 +21174,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -20081,7 +22702,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19064,22 +20402,23 @@
+@@ -19064,22 +21187,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20112,14 +22733,60 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19126,19 +20465,20 @@
+@@ -19095,24 +21219,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
+@@ -19126,19 +21262,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
@@ -20137,17 +22804,64 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19188,7 +20528,9 @@
+@@ -19157,24 +21294,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
+@@ -19188,8 +21337,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
-@@ -19198,13 +20540,11 @@
+
+@@ -19198,13 +21349,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -20164,7 +22878,7 @@
fi
fi
;;
-@@ -19217,7 +20557,7 @@
+@@ -19217,7 +21366,7 @@
ld_shlibs_GCJ=no
;;
@@ -20173,7 +22887,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19227,68 +20567,68 @@
+@@ -19227,68 +21376,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -20286,7 +23000,7 @@
fi
;;
-@@ -19322,8 +20662,8 @@
+@@ -19322,8 +21471,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20297,7 +23011,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19331,7 +20671,7 @@
+@@ -19331,7 +21480,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -20306,7 +23020,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
-@@ -19345,47 +20685,62 @@
+@@ -19345,47 +21494,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -20375,25 +23089,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- ;;
+- ;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19399,7 +20754,7 @@
+@@ -19399,7 +21563,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -20402,7 +23116,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'
-@@ -19409,7 +20764,7 @@
+@@ -19409,7 +21573,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -20411,7 +23125,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
-@@ -19432,7 +20787,8 @@
+@@ -19432,7 +21596,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
@@ -20421,7 +23135,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19442,7 +20798,7 @@
+@@ -19442,7 +21607,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -20430,7 +23144,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19453,14 +20809,14 @@
+@@ -19453,14 +21618,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -20447,7 +23161,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'
-@@ -19472,13 +20828,13 @@
+@@ -19472,13 +21637,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -20463,7 +23177,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19486,21 +20842,15 @@
+@@ -19486,21 +21651,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -20489,7 +23203,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'
-@@ -19509,8 +20859,18 @@
+@@ -19509,8 +21668,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20510,7 +23224,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19519,7 +20879,7 @@
+@@ -19519,7 +21688,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.
@@ -20519,7 +23233,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19567,36 +20927,45 @@
+@@ -19567,36 +21736,45 @@
fi
;;
@@ -20586,7 +23300,7 @@
;;
uts4*)
-@@ -19611,15 +20980,10 @@
+@@ -19611,15 +21789,10 @@
esac
fi
@@ -20604,7 +23318,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19637,8 +21001,8 @@
+@@ -19637,8 +21810,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.
@@ -20615,7 +23329,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19652,6 +21016,7 @@
+@@ -19652,6 +21825,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -20623,7 +23337,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19674,20 +21039,20 @@
+@@ -19674,20 +21848,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -20649,7 +23363,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19697,7 +21062,20 @@
+@@ -19697,7 +21871,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20671,7 +23385,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19762,7 +21140,7 @@
+@@ -19762,7 +21949,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20680,7 +23394,7 @@
;;
beos*)
-@@ -19771,7 +21149,7 @@
+@@ -19771,7 +21958,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -20689,7 +23403,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19787,7 +21165,7 @@
+@@ -19787,7 +21974,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -20698,7 +23412,7 @@
need_version=no
need_lib_prefix=no
-@@ -19799,7 +21177,8 @@
+@@ -19799,7 +21986,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -20708,7 +23422,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19829,7 +21208,7 @@
+@@ -19829,7 +22017,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20717,7 +23431,7 @@
;;
esac
;;
-@@ -19852,7 +21231,7 @@
+@@ -19852,7 +22040,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -20726,7 +23440,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"`
-@@ -19875,20 +21254,17 @@
+@@ -19875,20 +22063,17 @@
dynamic_linker=no
;;
@@ -20758,7 +23472,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19906,14 +21282,19 @@
+@@ -19906,14 +22091,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -20780,7 +23494,7 @@
esac
;;
-@@ -19933,9 +21314,9 @@
+@@ -19933,9 +22123,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -20792,7 +23506,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19950,7 +21331,7 @@
+@@ -19950,7 +22140,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -20801,7 +23515,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19961,7 +21342,7 @@
+@@ -19961,7 +22151,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -20810,7 +23524,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19973,6 +21354,18 @@
+@@ -19973,6 +22163,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -20829,7 +23543,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -20016,29 +21409,26 @@
+@@ -20016,29 +22218,26 @@
;;
# This must be Linux ELF.
@@ -20866,7 +23580,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,
-@@ -20048,6 +21438,18 @@
+@@ -20048,6 +22247,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -20885,7 +23599,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20057,7 +21459,7 @@
+@@ -20057,7 +22268,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -20894,7 +23608,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -20085,8 +21487,13 @@
+@@ -20085,8 +22296,13 @@
openbsd*)
version_type=sunos
@@ -20909,30 +23623,19 @@
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
-@@ -20104,976 +21511,162 @@
- fi
+@@ -20106,7 +22322,7 @@
+
+ os2*)
+ libname_spec='$name'
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -20124,13 +22340,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
--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"
-- ;;
--
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
@@ -20940,98 +23643,80 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--solaris*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- # ldd complains unless libraries are executable
-- postinstall_cmds='chmod +x $lib'
-- ;;
--
--sunos4*)
-- version_type=sunos
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- if test "$with_gnu_ld" = yes; then
-- need_lib_prefix=no
-- fi
-- need_version=yes
-- ;;
--
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -20156,7 +22365,7 @@
+ 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
-- ;;
--
--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
++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'
+@@ -20189,6 +22398,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ 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}'
+@@ -20200,16 +22432,21 @@
+ 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
--
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_GCJ=
--if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
--
-- # We can hardcode non-existant directories.
-- if test "$hardcode_direct_GCJ" != no &&
-- # If the only mechanism to avoid hardcoding is shlibpath_var, we
-- # have to relink, otherwise we might link with an installed library
-- # when we should be linking with a yet-to-be-installed one
-- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-- test "$hardcode_minus_L_GCJ" != no; then
-- # Linking always hardcodes the temporary library directory.
-- hardcode_action_GCJ=relink
-- else
-- # We can link without hardcoding, and we can hardcode nonexisting dirs.
-- hardcode_action_GCJ=immediate
++ test -n "$runpath_var_GCJ" || \
++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+@@ -20223,857 +22460,22 @@
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
@@ -21790,15 +24475,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
@@ -21808,17 +24485,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
@@ -21840,78 +24507,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
@@ -21926,91 +24539,35 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
- esac
+- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
+- fi
-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
++else
++ # 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
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+hardcode_action_GCJ=
-+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-+ test -n "$runpath_var_GCJ" || \
-+ 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
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-+ test "$hardcode_minus_L_GCJ" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action_GCJ=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action_GCJ=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action_GCJ=unsupported
-+fi
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
@@ -22028,7 +24585,7 @@
fi
-@@ -21090,7 +21683,8 @@
+@@ -21090,7 +22492,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.
@@ -22038,7 +24595,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 \
-@@ -21190,6 +21784,12 @@
+@@ -21190,6 +22593,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22051,7 +24608,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21201,6 +21801,9 @@
+@@ -21201,6 +22610,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22061,7 +24618,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21220,7 +21823,7 @@
+@@ -21220,7 +22632,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22070,7 +24627,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21251,7 +21854,7 @@
+@@ -21251,7 +22663,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22079,7 +24636,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21266,7 +21869,7 @@
+@@ -21266,7 +22678,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -22088,7 +24645,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21468,7 +22071,10 @@
+@@ -21468,7 +22880,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.
@@ -22100,7 +24657,7 @@
fi
-@@ -21488,7 +22094,6 @@
+@@ -21488,7 +22903,6 @@
RC)
@@ -22108,7 +24665,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21507,15 +22112,42 @@
+@@ -21507,15 +22921,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22151,7 +24708,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21531,7 +22163,8 @@
+@@ -21531,7 +22972,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.
@@ -22161,7 +24718,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 \
-@@ -21631,6 +22264,12 @@
+@@ -21631,6 +23073,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22174,7 +24731,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21642,6 +22281,9 @@
+@@ -21642,6 +23090,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22184,7 +24741,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21661,7 +22303,7 @@
+@@ -21661,7 +23112,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22193,7 +24750,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21692,7 +22334,7 @@
+@@ -21692,7 +23143,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22202,7 +24759,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21707,7 +22349,7 @@
+@@ -21707,7 +23158,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -22211,7 +24768,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21909,7 +22551,10 @@
+@@ -21909,7 +23360,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.
@@ -22223,7 +24780,7 @@
fi
-@@ -21956,7 +22601,7 @@
+@@ -21956,7 +23410,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -22232,7 +24789,7 @@
# Prevent multiple expansion
-@@ -22011,8 +22656,8 @@
+@@ -22011,8 +23465,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -22243,7 +24800,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22038,17 +22683,17 @@
+@@ -22038,17 +23492,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -22267,7 +24824,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22063,32 +22708,33 @@
+@@ -22063,32 +23517,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22309,7 +24866,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22097,8 +22743,8 @@
+@@ -22097,8 +23552,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -22320,7 +24877,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22124,11 +22770,11 @@
+@@ -22124,11 +23579,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -22336,7 +24893,7 @@
fi
-@@ -22136,8 +22782,8 @@
+@@ -22136,8 +23591,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -22347,7 +24904,7 @@
XGETTEXT=":"
fi
fi
-@@ -22147,8 +22793,7 @@
+@@ -22147,8 +23602,7 @@
@@ -22357,7 +24914,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'
-@@ -22160,8 +22805,8 @@
+@@ -22160,8 +23614,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -22368,15 +24925,61 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22215,15 +22860,16 @@
+@@ -22189,24 +23643,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
+@@ -22215,15 +23681,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
@@ -22388,7 +24991,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22252,15 +22898,14 @@
+@@ -22252,15 +23719,14 @@
@@ -22407,7 +25010,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'
-@@ -22272,9 +22917,6 @@
+@@ -22272,9 +23738,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22417,18 +25020,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22326,8 +22968,9 @@
+@@ -22300,24 +23763,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
+@@ -22326,9 +23801,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"
-@@ -22341,11 +22984,11 @@
+ ac_ext=c
+@@ -22341,11 +23817,11 @@
fi
@@ -22444,7 +25094,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22366,8 +23009,7 @@
+@@ -22366,8 +23842,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -22454,7 +25104,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'
-@@ -22432,9 +23074,10 @@
+@@ -22405,24 +23880,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
+@@ -22432,10 +23919,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22462,11 +25157,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
-@@ -22448,8 +23091,8 @@
+ ac_ext=c
+@@ -22448,8 +23936,8 @@
fi
@@ -22477,7 +25174,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22473,15 +23116,14 @@
+@@ -22473,15 +23961,14 @@
@@ -22496,7 +25193,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'
-@@ -22493,9 +23135,6 @@
+@@ -22493,9 +23980,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22506,18 +25203,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22546,8 +23185,9 @@
+@@ -22520,24 +24004,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
+@@ -22546,9 +24042,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"
-@@ -22561,11 +23201,11 @@
+ ac_ext=c
+@@ -22561,11 +24058,11 @@
fi
@@ -22533,7 +25277,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22586,8 +23226,7 @@
+@@ -22586,8 +24083,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -22543,7 +25287,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'
-@@ -22651,9 +23290,10 @@
+@@ -22624,24 +24120,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
+@@ -22651,10 +24159,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22551,11 +25340,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
-@@ -22667,8 +23307,8 @@
+ ac_ext=c
+@@ -22667,8 +24176,8 @@
fi
@@ -22566,7 +25357,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22691,8 +23331,8 @@
+@@ -22691,8 +24200,8 @@
@@ -22577,7 +25368,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22709,7 +23349,7 @@
+@@ -22709,30 +24218,42 @@
int
main ()
{
@@ -22586,15 +25377,59 @@
;
return 0;
}
-@@ -22741,20 +23381,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
+@@ -22741,20 +24262,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
@@ -22613,7 +25448,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22771,7 +23412,7 @@
+@@ -22771,30 +24293,42 @@
int
main ()
{
@@ -22622,15 +25457,59 @@
;
return 0;
}
-@@ -22803,21 +23444,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
+@@ -22803,21 +24337,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
@@ -22650,7 +25529,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22830,17 +23472,17 @@
+@@ -22830,40 +24365,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22672,15 +25551,59 @@
;
return 0;
}
-@@ -22872,19 +23514,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
+@@ -22872,19 +24419,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
@@ -22698,7 +25621,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22897,17 +23540,17 @@
+@@ -22897,40 +24445,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22720,15 +25643,59 @@
;
return 0;
}
-@@ -22939,14 +23582,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
+@@ -22939,14 +24499,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
@@ -22739,7 +25706,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22972,13 +23616,13 @@
+@@ -22972,13 +24533,13 @@
fi
@@ -22756,17 +25723,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'
-@@ -23036,7 +23680,9 @@
+@@ -23007,24 +24568,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
+@@ -23036,8 +24609,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'
-@@ -23047,17 +23693,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23047,17 +24622,17 @@
fi
@@ -22789,17 +25803,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'
-@@ -23115,7 +23761,9 @@
+@@ -23086,24 +24661,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
+@@ -23115,8 +24702,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
-@@ -23127,8 +23775,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23127,8 +24716,8 @@
fi
@@ -22810,7 +25871,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23141,8 +23789,8 @@
+@@ -23141,8 +24730,8 @@
_ACEOF
@@ -22821,7 +25882,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23155,17 +23803,17 @@
+@@ -23155,40 +24744,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22843,15 +25904,59 @@
;
return 0;
}
-@@ -23197,21 +23845,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
+@@ -23197,21 +24798,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
@@ -22871,7 +25976,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23224,17 +23873,17 @@
+@@ -23224,40 +24826,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22893,15 +25998,59 @@
;
return 0;
}
-@@ -23266,21 +23915,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
+@@ -23266,21 +24880,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
@@ -22921,7 +26070,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23307,30 +23957,24 @@
+@@ -23307,53 +24922,59 @@
#undef inet_ntoa
@@ -22957,15 +26106,59 @@
;
return 0;
}
-@@ -23362,17 +24006,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
+@@ -23362,17 +24983,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
@@ -22981,7 +26174,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23385,17 +24030,17 @@
+@@ -23385,40 +25007,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23003,15 +26196,59 @@
;
return 0;
}
-@@ -23427,21 +24072,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
+@@ -23427,21 +25061,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
@@ -23031,7 +26268,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23468,30 +24114,24 @@
+@@ -23468,53 +25103,59 @@
#undef connect
@@ -23067,15 +26304,59 @@
;
return 0;
}
-@@ -23523,17 +24163,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
+@@ -23523,17 +25164,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
@@ -23091,7 +26372,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23546,17 +24187,17 @@
+@@ -23546,40 +25188,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23113,15 +26394,59 @@
;
return 0;
}
-@@ -23588,22 +24229,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
+@@ -23588,22 +25242,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
@@ -23142,7 +26467,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23630,30 +24272,24 @@
+@@ -23630,53 +25285,59 @@
#undef remove
@@ -23178,15 +26503,59 @@
;
return 0;
}
-@@ -23685,17 +24321,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
+@@ -23685,17 +25346,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
@@ -23202,7 +26571,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23708,17 +24345,17 @@
+@@ -23708,40 +25370,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23224,15 +26593,59 @@
;
return 0;
}
-@@ -23750,14 +24387,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
+@@ -23750,14 +25424,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
@@ -23243,7 +26656,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23765,8 +24403,8 @@
+@@ -23765,8 +25440,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -23254,7 +26667,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23793,30 +24431,24 @@
+@@ -23793,53 +25468,59 @@
#undef shmat
@@ -23290,15 +26703,59 @@
;
return 0;
}
-@@ -23848,18 +24480,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
+@@ -23848,18 +25529,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
@@ -23315,7 +26772,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23872,17 +24505,17 @@
+@@ -23872,40 +25554,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23337,15 +26794,59 @@
;
return 0;
}
-@@ -23914,14 +24547,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
+@@ -23914,14 +25608,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
@@ -23356,7 +26857,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23935,18 +24569,19 @@
+@@ -23935,18 +25630,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23384,17 +26885,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23983,15 +24618,16 @@
+@@ -23957,24 +25653,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
+@@ -23983,15 +25691,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; }
@@ -23406,7 +26953,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24025,9 +24661,10 @@
+@@ -24000,8 +25709,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
+@@ -24025,9 +25739,10 @@
ac_header_preproc=no
fi
@@ -23419,7 +26982,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24051,25 +24688,19 @@
+@@ -24051,25 +25766,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;}
@@ -23452,7 +27015,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24087,18 +24718,19 @@
+@@ -24087,18 +25796,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23480,17 +27043,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24135,15 +24767,16 @@
+@@ -24109,24 +25819,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
+@@ -24135,15 +25857,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; }
@@ -23502,7 +27111,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24177,9 +24810,10 @@
+@@ -24152,8 +25875,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
+@@ -24177,9 +25905,10 @@
ac_header_preproc=no
fi
@@ -23515,7 +27140,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24203,25 +24837,19 @@
+@@ -24203,25 +25932,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;}
@@ -23548,7 +27173,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24235,8 +24863,8 @@
+@@ -24235,8 +25958,8 @@
# darwin requires a poll emulation library
@@ -23559,7 +27184,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24249,17 +24877,17 @@
+@@ -24249,40 +25972,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23581,15 +27206,59 @@
;
return 0;
}
-@@ -24291,14 +24919,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
+@@ -24291,14 +26026,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
@@ -23600,7 +27269,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24309,18 +24938,19 @@
+@@ -24309,18 +26045,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23628,17 +27297,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24357,15 +24987,16 @@
+@@ -24331,24 +26068,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
+@@ -24357,15 +26106,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; }
@@ -23650,7 +27365,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24399,9 +25030,10 @@
+@@ -24374,8 +26124,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
+@@ -24399,9 +26154,10 @@
ac_header_preproc=no
fi
@@ -23663,7 +27394,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24425,25 +25057,19 @@
+@@ -24425,25 +26181,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;}
@@ -23696,7 +27427,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24458,17 +25084,17 @@
+@@ -24458,17 +26208,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -23720,17 +27451,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24505,15 +25131,16 @@
+@@ -24479,24 +26229,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
+@@ -24505,15 +26267,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; }
@@ -23742,7 +27519,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24547,9 +25174,10 @@
+@@ -24522,8 +26285,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
+@@ -24547,9 +26315,10 @@
ac_header_preproc=no
fi
@@ -23755,7 +27548,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24573,25 +25201,18 @@
+@@ -24573,25 +26342,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;}
@@ -23786,7 +27579,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24608,8 +25229,8 @@
+@@ -24608,8 +26370,8 @@
@@ -23797,7 +27590,50 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24658,8 +25279,8 @@
+@@ -24635,31 +26397,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"
@@ -23808,7 +27644,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24670,25 +25291,25 @@
+@@ -24670,25 +26444,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23818,8 +27654,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
@@ -23840,7 +27677,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'
-@@ -24700,9 +25321,6 @@
+@@ -24700,9 +26474,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -23850,18 +27687,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24754,8 +25372,9 @@
+@@ -24728,24 +26499,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
+@@ -24754,9 +26537,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"
-@@ -24769,11 +25388,11 @@
+ ac_ext=c
+@@ -24769,11 +26553,11 @@
fi
@@ -23877,7 +27761,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24794,8 +25413,7 @@
+@@ -24794,8 +26578,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -23887,7 +27771,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'
-@@ -24860,9 +25478,10 @@
+@@ -24833,24 +26616,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
+@@ -24860,10 +26655,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23895,11 +27824,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
-@@ -24876,8 +25495,8 @@
+ ac_ext=c
+@@ -24876,8 +26672,8 @@
fi
@@ -23910,7 +27841,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24904,8 +25523,8 @@
+@@ -24904,8 +26700,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -23921,7 +27852,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24918,17 +25537,17 @@
+@@ -24918,40 +26714,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23943,15 +27874,59 @@
;
return 0;
}
-@@ -24960,27 +25579,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
+@@ -24960,27 +26768,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
@@ -23981,7 +27956,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24993,17 +25613,17 @@
+@@ -24993,40 +26802,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24003,15 +27978,59 @@
;
return 0;
}
-@@ -25035,22 +25655,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
+@@ -25035,22 +26856,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
@@ -24032,7 +28051,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25061,12 +25682,13 @@
+@@ -25061,36 +26883,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24048,15 +28067,60 @@
return 0;
;
return 0;
-@@ -25099,20 +25721,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
+@@ -25099,20 +26934,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
@@ -24076,7 +28140,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.
-@@ -25125,10 +25748,11 @@
+@@ -25125,10 +26961,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24089,7 +28153,52 @@
test_array [0] = 0
;
-@@ -25166,10 +25790,11 @@
+@@ -25136,24 +26973,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
+@@ -25166,10 +27015,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24102,7 +28211,52 @@
test_array [0] = 0
;
-@@ -25203,30 +25828,32 @@
+@@ -25177,24 +27027,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
+@@ -25203,30 +27065,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24119,8 +28273,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
@@ -24143,7 +28298,52 @@
test_array [0] = 0
;
-@@ -25264,10 +25891,11 @@
+@@ -25234,24 +27098,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
+@@ -25264,10 +27140,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24156,7 +28356,52 @@
test_array [0] = 0
;
-@@ -25301,23 +25929,26 @@
+@@ -25275,24 +27152,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
+@@ -25301,24 +27190,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24173,8 +28418,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
@@ -24183,14 +28429,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
-@@ -25329,10 +25960,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25329,10 +27221,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24203,15 +28452,61 @@
test_array [0] = 0
;
-@@ -25366,26 +25998,20 @@
+@@ -25340,24 +27233,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
+@@ -25366,26 +27271,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;;
@@ -24235,7 +28530,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25393,8 +26019,9 @@
+@@ -25393,8 +27292,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24247,7 +28542,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25403,22 +26030,22 @@
+@@ -25403,35 +27303,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24279,7 +28574,33 @@
;
return 0;
-@@ -25442,28 +26069,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
+@@ -25442,28 +27351,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24316,7 +28637,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25474,12 +26100,13 @@
+@@ -25474,36 +27382,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24332,15 +28653,60 @@
return 0;
;
return 0;
-@@ -25512,20 +26139,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
+@@ -25512,20 +27433,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
@@ -24360,7 +28726,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.
-@@ -25538,10 +26166,11 @@
+@@ -25538,10 +27460,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24373,7 +28739,52 @@
test_array [0] = 0
;
-@@ -25579,10 +26208,11 @@
+@@ -25549,24 +27472,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
+@@ -25579,10 +27514,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24386,7 +28797,52 @@
test_array [0] = 0
;
-@@ -25616,30 +26246,32 @@
+@@ -25590,24 +27526,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
+@@ -25616,30 +27564,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24403,8 +28859,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
@@ -24427,7 +28884,52 @@
test_array [0] = 0
;
-@@ -25677,10 +26309,11 @@
+@@ -25647,24 +27597,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
+@@ -25677,10 +27639,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24440,7 +28942,52 @@
test_array [0] = 0
;
-@@ -25714,23 +26347,26 @@
+@@ -25688,24 +27651,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
+@@ -25714,24 +27689,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24457,8 +29004,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
@@ -24467,14 +29015,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
-@@ -25742,10 +26378,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25742,10 +27720,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24487,15 +29038,61 @@
test_array [0] = 0
;
-@@ -25779,26 +26416,20 @@
+@@ -25753,24 +27732,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
+@@ -25779,26 +27770,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;;
@@ -24519,7 +29116,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25806,8 +26437,9 @@
+@@ -25806,8 +27791,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24531,7 +29128,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25816,22 +26448,22 @@
+@@ -25816,35 +27802,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24563,7 +29160,33 @@
;
return 0;
-@@ -25855,28 +26487,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
+@@ -25855,28 +27850,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24600,7 +29223,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25887,12 +26518,13 @@
+@@ -25887,36 +27881,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24616,15 +29239,60 @@
return 0;
;
return 0;
-@@ -25925,20 +26557,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
+@@ -25925,20 +27932,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
@@ -24644,7 +29312,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.
-@@ -25951,10 +26584,11 @@
+@@ -25951,10 +27959,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24657,7 +29325,52 @@
test_array [0] = 0
;
-@@ -25992,10 +26626,11 @@
+@@ -25962,24 +27971,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
+@@ -25992,10 +28013,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24670,7 +29383,52 @@
test_array [0] = 0
;
-@@ -26029,30 +26664,32 @@
+@@ -26003,24 +28025,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
+@@ -26029,30 +28063,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24687,8 +29445,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
@@ -24711,7 +29470,52 @@
test_array [0] = 0
;
-@@ -26090,10 +26727,11 @@
+@@ -26060,24 +28096,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
+@@ -26090,10 +28138,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24724,7 +29528,52 @@
test_array [0] = 0
;
-@@ -26127,23 +26765,26 @@
+@@ -26101,24 +28150,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
+@@ -26127,24 +28188,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24741,8 +29590,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
@@ -24751,14 +29601,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
-@@ -26155,10 +26796,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26155,10 +28219,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24771,15 +29624,61 @@
test_array [0] = 0
;
-@@ -26192,26 +26834,20 @@
+@@ -26166,24 +28231,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
+@@ -26192,26 +28269,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;;
@@ -24803,7 +29702,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26219,8 +26855,9 @@
+@@ -26219,8 +28290,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24815,7 +29714,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26229,22 +26866,22 @@
+@@ -26229,35 +28301,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -24847,7 +29746,33 @@
;
return 0;
-@@ -26268,28 +26905,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
+@@ -26268,28 +28349,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -24884,7 +29809,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26300,12 +26936,13 @@
+@@ -26300,36 +28380,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24900,15 +29825,60 @@
return 0;
;
return 0;
-@@ -26338,20 +26975,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
+@@ -26338,20 +28431,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
@@ -24928,7 +29898,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.
-@@ -26364,10 +27002,11 @@
+@@ -26364,10 +28458,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24941,7 +29911,52 @@
test_array [0] = 0
;
-@@ -26405,10 +27044,11 @@
+@@ -26375,24 +28470,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
+@@ -26405,10 +28512,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24954,7 +29969,52 @@
test_array [0] = 0
;
-@@ -26442,30 +27082,32 @@
+@@ -26416,24 +28524,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
+@@ -26442,30 +28562,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24971,8 +30031,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
@@ -24995,7 +30056,52 @@
test_array [0] = 0
;
-@@ -26503,10 +27145,11 @@
+@@ -26473,24 +28595,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
+@@ -26503,10 +28637,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25008,7 +30114,52 @@
test_array [0] = 0
;
-@@ -26540,23 +27183,26 @@
+@@ -26514,24 +28649,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
+@@ -26540,24 +28687,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25025,8 +30176,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
@@ -25035,14 +30187,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
-@@ -26568,10 +27214,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26568,10 +28718,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25055,15 +30210,61 @@
test_array [0] = 0
;
-@@ -26605,26 +27252,20 @@
+@@ -26579,24 +28730,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
+@@ -26605,26 +28768,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;;
@@ -25087,7 +30288,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26632,8 +27273,9 @@
+@@ -26632,8 +28789,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25099,7 +30300,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26642,22 +27284,22 @@
+@@ -26642,35 +28800,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25131,7 +30332,33 @@
;
return 0;
-@@ -26681,30 +27323,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
+@@ -26681,30 +28848,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25170,7 +30397,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26717,17 +27358,17 @@
+@@ -26717,40 +28883,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25192,15 +30419,59 @@
;
return 0;
}
-@@ -26759,14 +27400,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
+@@ -26759,14 +28937,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
@@ -25211,7 +30482,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26775,8 +27417,8 @@
+@@ -26775,8 +28954,8 @@
fi
@@ -25222,7 +30493,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26789,17 +27431,17 @@
+@@ -26789,40 +28968,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25244,15 +30515,59 @@
;
return 0;
}
-@@ -26831,14 +27473,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
+@@ -26831,14 +29022,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
@@ -25263,7 +30578,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26852,8 +27495,8 @@
+@@ -26852,8 +29044,8 @@
@@ -25274,7 +30589,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26864,12 +27507,13 @@
+@@ -26864,36 +29056,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25290,15 +30605,60 @@
return 0;
;
return 0;
-@@ -26902,20 +27546,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
+@@ -26902,20 +29107,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
@@ -25318,7 +30678,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.
-@@ -26928,10 +27573,11 @@
+@@ -26928,10 +29134,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25331,7 +30691,52 @@
test_array [0] = 0
;
-@@ -26969,10 +27615,11 @@
+@@ -26939,24 +29146,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
+@@ -26969,10 +29188,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25344,7 +30749,52 @@
test_array [0] = 0
;
-@@ -27006,30 +27653,32 @@
+@@ -26980,24 +29200,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
+@@ -27006,30 +29238,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25361,8 +30811,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
@@ -25385,7 +30836,52 @@
test_array [0] = 0
;
-@@ -27067,10 +27716,11 @@
+@@ -27037,24 +29271,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
+@@ -27067,10 +29313,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25398,7 +30894,52 @@
test_array [0] = 0
;
-@@ -27104,23 +27754,26 @@
+@@ -27078,24 +29325,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
+@@ -27104,24 +29363,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25415,8 +30956,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
@@ -25425,14 +30967,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
-@@ -27132,10 +27785,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27132,10 +29394,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25445,15 +30990,61 @@
test_array [0] = 0
;
-@@ -27169,26 +27823,20 @@
+@@ -27143,24 +29406,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
+@@ -27169,26 +29444,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;;
@@ -25477,7 +31068,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27196,8 +27844,9 @@
+@@ -27196,8 +29465,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25489,7 +31080,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27206,22 +27855,22 @@
+@@ -27206,35 +29476,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25521,7 +31112,33 @@
;
return 0;
-@@ -27245,29 +27894,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
+@@ -27245,29 +29524,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25559,7 +31176,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27278,12 +27926,13 @@
+@@ -27278,36 +29556,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25575,15 +31192,60 @@
return 0;
;
return 0;
-@@ -27316,20 +27965,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
+@@ -27316,20 +29607,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
@@ -25603,7 +31265,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.
-@@ -27342,10 +27992,11 @@
+@@ -27342,10 +29634,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25616,7 +31278,52 @@
test_array [0] = 0
;
-@@ -27383,10 +28034,11 @@
+@@ -27353,24 +29646,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
+@@ -27383,10 +29688,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25629,7 +31336,52 @@
test_array [0] = 0
;
-@@ -27420,30 +28072,32 @@
+@@ -27394,24 +29700,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
+@@ -27420,30 +29738,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25646,8 +31398,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
@@ -25670,7 +31423,52 @@
test_array [0] = 0
;
-@@ -27481,10 +28135,11 @@
+@@ -27451,24 +29771,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
+@@ -27481,10 +29813,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25683,7 +31481,52 @@
test_array [0] = 0
;
-@@ -27518,23 +28173,26 @@
+@@ -27492,24 +29825,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
+@@ -27518,24 +29863,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25700,8 +31543,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
@@ -25710,14 +31554,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
-@@ -27546,10 +28204,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27546,10 +29894,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25730,15 +31577,61 @@
test_array [0] = 0
;
-@@ -27583,26 +28242,20 @@
+@@ -27557,24 +29906,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
+@@ -27583,26 +29944,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;;
@@ -25762,7 +31655,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27610,8 +28263,9 @@
+@@ -27610,8 +29965,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -25774,7 +31667,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27620,22 +28274,22 @@
+@@ -27620,35 +29976,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -25806,7 +31699,33 @@
;
return 0;
-@@ -27659,30 +28313,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
+@@ -27659,30 +30024,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -25845,9 +31764,50 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27724,15 +28377,15 @@
+@@ -27703,36 +30067,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
@@ -25865,16 +31825,17 @@
{ { 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!
-@@ -27744,18 +28397,18 @@
+@@ -27744,18 +30120,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
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking for PIE support" >&5
+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
if test "${kde_cv_val_pie_support+set}" = set; then
@@ -25888,18 +31849,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'
-@@ -27811,8 +28464,9 @@
+@@ -27785,24 +30161,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
+@@ -27811,9 +30199,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
-@@ -27826,26 +28480,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27826,26 +30215,26 @@
fi
@@ -25936,7 +31944,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27864,18 +28518,19 @@
+@@ -27864,18 +30253,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -25964,17 +31972,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27912,15 +28567,16 @@
+@@ -27886,24 +30276,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
+@@ -27912,15 +30314,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; }
@@ -25986,7 +32040,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27954,9 +28610,10 @@
+@@ -27929,8 +30332,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
+@@ -27954,9 +30362,10 @@
ac_header_preproc=no
fi
@@ -25999,7 +32069,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27980,25 +28637,19 @@
+@@ -27980,25 +30389,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;}
@@ -26032,7 +32102,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28010,8 +28661,8 @@
+@@ -28010,8 +30413,8 @@
done
@@ -26043,7 +32113,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28038,30 +28689,24 @@
+@@ -28038,53 +30441,59 @@
#undef _NSGetEnviron
@@ -26079,15 +32149,59 @@
;
return 0;
}
-@@ -28093,13 +28738,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
+@@ -28093,13 +30502,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
@@ -26097,7 +32211,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28120,9 +28766,9 @@
+@@ -28120,9 +30530,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26110,7 +32224,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28148,30 +28794,24 @@
+@@ -28148,53 +30558,59 @@
#undef $ac_func
@@ -26146,15 +32260,59 @@
;
return 0;
}
-@@ -28203,13 +28843,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
+@@ -28203,13 +30619,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
@@ -26165,7 +32323,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28226,32 +28868,32 @@
+@@ -28226,32 +30644,32 @@
@@ -26180,9 +32338,9 @@
-fi;
+fi
-+
-# Check whether --enable-qtopia or --disable-qtopia was given.
++
+# Check whether --enable-qtopia was given.
if test "${enable_qtopia+set}" = set; then
- enableval="$enable_qtopia"
@@ -26193,9 +32351,9 @@
-fi;
+fi
++
-# Check whether --enable-mac or --disable-mac was given.
-+
+# Check whether --enable-mac was given.
if test "${enable_mac+set}" = set; then
- enableval="$enable_mac"
@@ -26210,7 +32368,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28267,8 +28909,8 @@
+@@ -28267,8 +30685,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -26221,7 +32379,23 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28373,6 +29015,7 @@
+@@ -28305,8 +30723,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
+@@ -28373,6 +30796,7 @@
fi
done
fi
@@ -26229,7 +32403,52 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28430,7 +29073,7 @@
+@@ -28402,24 +30826,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
+@@ -28430,7 +30866,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26238,15 +32457,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}/` \
-@@ -28478,6 +29121,7 @@
+@@ -28478,7 +30914,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
-@@ -28488,7 +29132,7 @@
+
+@@ -28488,21 +30925,26 @@
*-*-solaris*)
;;
*)
@@ -26254,15 +32475,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.
-@@ -28496,13 +29140,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 &&
@@ -26272,7 +32502,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28510,7 +29154,7 @@
+@@ -28510,7 +30952,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
@@ -26281,7 +32511,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28519,7 +29163,7 @@
+@@ -28519,7 +30961,7 @@
esac
fi
cd ..
@@ -26290,7 +32520,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28563,12 +29207,12 @@
+@@ -28563,12 +31005,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -26307,7 +32537,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28596,8 +29240,8 @@
+@@ -28596,8 +31038,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.
@@ -26318,7 +32548,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28610,17 +29254,17 @@
+@@ -28610,40 +31052,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26340,15 +32570,59 @@
;
return 0;
}
-@@ -28652,14 +29296,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
+@@ -28652,14 +31106,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
@@ -26359,7 +32633,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28668,8 +29313,8 @@
+@@ -28668,8 +31123,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -26370,7 +32644,52 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28729,9 +29374,10 @@
+@@ -28703,24 +31158,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
+@@ -28729,10 +31196,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26378,11 +32697,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
-@@ -28741,8 +29387,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28741,8 +31209,8 @@
fi
@@ -26393,7 +32714,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28888,8 +29534,8 @@
+@@ -28888,8 +31356,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -26404,7 +32725,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28900,9 +29546,9 @@
+@@ -28900,9 +31368,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -26417,7 +32738,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28914,17 +29560,17 @@
+@@ -28914,40 +31382,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26439,15 +32760,59 @@
;
return 0;
}
-@@ -28956,14 +29602,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
+@@ -28956,14 +31436,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
@@ -26459,7 +32824,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28976,8 +29624,8 @@
+@@ -28976,8 +31458,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -26470,7 +32835,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28990,17 +29638,17 @@
+@@ -28990,40 +31472,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26492,15 +32857,59 @@
;
return 0;
}
-@@ -29032,14 +29680,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
+@@ -29032,14 +31526,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
@@ -26511,7 +32920,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29047,8 +29696,8 @@
+@@ -29047,8 +31542,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -26522,8 +32931,50 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29089,17 +29738,18 @@
+@@ -29067,40 +31562,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
@@ -26541,11 +32992,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
-@@ -29115,16 +29765,15 @@
+ fi
+@@ -29115,16 +31623,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -26566,17 +33019,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'
-@@ -29177,7 +29826,9 @@
+@@ -29151,24 +31658,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
+@@ -29177,8 +31696,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"
-@@ -29191,13 +29842,13 @@
+ ac_ext=c
+@@ -29191,13 +31712,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -26594,7 +33094,7 @@
:
fi
-@@ -29209,16 +29860,15 @@
+@@ -29209,16 +31730,15 @@
case $host_os in
solaris*)
@@ -26615,17 +33115,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'
-@@ -29271,7 +29921,9 @@
+@@ -29245,24 +31765,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
+@@ -29271,8 +31803,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"
-@@ -29285,13 +29937,13 @@
+ ac_ext=c
+@@ -29285,13 +31819,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -26643,7 +33190,7 @@
:
fi
-@@ -29318,17 +29970,17 @@
+@@ -29318,17 +31852,17 @@
@@ -26667,7 +33214,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29346,21 +29998,21 @@
+@@ -29346,21 +31880,21 @@
fi
@@ -26697,7 +33244,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29379,14 +30031,14 @@
+@@ -29379,14 +31913,14 @@
@@ -26716,18 +33263,65 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29446,8 +30098,9 @@
+@@ -29420,24 +31954,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
+@@ -29446,9 +31992,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"
-@@ -29461,8 +30114,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29461,8 +32008,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -26738,7 +33332,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29482,8 +30135,8 @@
+@@ -29482,8 +32029,8 @@
@@ -26749,7 +33343,52 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29545,9 +30198,10 @@
+@@ -29519,24 +32066,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
+@@ -29545,10 +32104,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26757,11 +33396,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"
-@@ -29562,19 +30216,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29562,19 +32122,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -26787,18 +33428,65 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29633,8 +30287,9 @@
+@@ -29607,24 +32167,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
+@@ -29633,9 +32205,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"
-@@ -29645,14 +30300,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29645,14 +32218,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -26819,18 +33507,65 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29711,8 +30366,9 @@
+@@ -29685,24 +32258,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
+@@ -29711,9 +32296,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"
-@@ -29723,11 +30379,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29723,11 +32309,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -26846,16 +33581,16 @@
LIBJPEG=
-@@ -29747,7 +30403,7 @@
+@@ -29747,7 +32333,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29750: $i/$j" >&5
-+ echo "configure: 30406: $i/$j" >&5
++ echo "configure: 32336: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29794,14 +30450,14 @@
+@@ -29794,14 +32380,14 @@
@@ -26873,7 +33608,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29844,8 +30500,8 @@
+@@ -29844,8 +32430,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -26884,7 +33619,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29854,8 +30510,8 @@
+@@ -29854,8 +32440,8 @@
{ (exit 1); exit 1; }; }
else
@@ -26895,7 +33630,7 @@
PERL=$kde_cv_path
fi
-@@ -29869,10 +30525,9 @@
+@@ -29869,10 +32455,9 @@
@@ -26908,7 +33643,7 @@
else
if test $kde_qtver = 3; then
-@@ -29882,7 +30537,8 @@
+@@ -29882,7 +32467,8 @@
fi
@@ -26918,7 +33653,7 @@
USING_QT_MT=""
-@@ -29902,13 +30558,13 @@
+@@ -29902,13 +32488,13 @@
else
kde_check_threading_default=yes
fi
@@ -26936,7 +33671,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29980,8 +30636,8 @@
+@@ -29980,8 +32566,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -26947,7 +33682,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"
-@@ -29990,34 +30646,34 @@
+@@ -29990,34 +32576,34 @@
qt_libraries=""
qt_includes=""
@@ -26994,16 +33729,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30045,7 +30701,7 @@
+@@ -30045,7 +32631,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30048: $i/$j" >&5
-+ echo "configure: 30704: $i/$j" >&5
++ echo "configure: 32634: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30082,8 +30738,7 @@
+@@ -30082,8 +32668,7 @@
ac_qt_libraries="$qt_libdir"
@@ -27013,7 +33748,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'
-@@ -30220,13 +30875,13 @@
+@@ -30220,13 +32805,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -27031,7 +33766,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30235,15 +30890,14 @@
+@@ -30235,15 +32820,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -27050,7 +33785,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'
-@@ -30364,12 +31018,12 @@
+@@ -30364,12 +32948,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -27067,7 +33802,7 @@
fi
-@@ -30407,14 +31061,14 @@
+@@ -30407,14 +32991,14 @@
fi
@@ -27085,7 +33820,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30457,8 +31111,8 @@
+@@ -30457,8 +33041,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27096,7 +33831,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30479,22 +31133,22 @@
+@@ -30479,22 +33063,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27124,7 +33859,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30537,12 +31191,12 @@
+@@ -30537,12 +33121,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27141,7 +33876,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30572,10 +31226,10 @@
+@@ -30572,10 +33156,10 @@
if test $kde_qtver = 3; then
@@ -27155,7 +33890,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30598,22 +31252,22 @@
+@@ -30598,22 +33182,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27185,7 +33920,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30636,13 +31290,13 @@
+@@ -30636,13 +33220,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27203,7 +33938,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30673,15 +31327,14 @@
+@@ -30673,15 +33257,14 @@
if test -n "$LIBJPEG"; then
@@ -27222,18 +33957,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'
-@@ -30740,8 +31393,9 @@
+@@ -30714,24 +33297,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
+@@ -30740,9 +33335,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"
-@@ -30758,12 +31412,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30758,12 +33354,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -27250,7 +34032,7 @@
LIBJPEG_QT=
fi
-@@ -30794,15 +31448,15 @@
+@@ -30794,15 +33390,15 @@
@@ -27272,7 +34054,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30826,11 +31480,11 @@
+@@ -30826,11 +33422,11 @@
@@ -27288,34 +34070,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30882,7 +31536,7 @@
+@@ -30882,7 +33478,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30885: $i/$j" >&5
-+ echo "configure: 31539: $i/$j" >&5
++ echo "configure: 33481: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30912,7 +31566,7 @@
+@@ -30912,7 +33508,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30915: $i/$j" >&5
-+ echo "configure: 31569: $i/$j" >&5
++ echo "configure: 33511: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30930,7 +31584,7 @@
+@@ -30930,7 +33526,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30933: $i/$j" >&5
-+ echo "configure: 31587: $i/$j" >&5
++ echo "configure: 33529: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30989,12 +31643,12 @@
+@@ -30989,12 +33585,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -27332,7 +34114,7 @@
fi
kde_libraries="${libdir}"
-@@ -31003,8 +31657,8 @@
+@@ -31003,8 +33599,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -27343,7 +34125,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31042,8 +31696,8 @@
+@@ -31042,8 +33638,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -27354,7 +34136,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31086,8 +31740,8 @@
+@@ -31086,8 +33682,8 @@
fi
@@ -27365,7 +34147,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31119,10 +31773,9 @@
+@@ -31119,10 +33715,9 @@
@@ -27378,46 +34160,46 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31136,13 +31789,14 @@
+@@ -31136,13 +33731,14 @@
fi
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for KDE paths" >&5
-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31253,15 +31907,14 @@
+@@ -31253,15 +33849,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'
-@@ -31313,8 +31966,8 @@
+@@ -31313,8 +33908,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -27428,7 +34210,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.
-@@ -31353,8 +32006,8 @@
+@@ -31353,8 +33948,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -27439,7 +34221,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
-@@ -31362,8 +32015,8 @@
+@@ -31362,8 +33957,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -27450,28 +34232,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
-@@ -31556,15 +32209,14 @@
+@@ -31556,15 +34151,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'
-@@ -31616,8 +32268,8 @@
+@@ -31616,8 +34210,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -27482,7 +34264,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.
-@@ -31656,8 +32308,8 @@
+@@ -31656,8 +34250,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -27493,7 +34275,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
-@@ -31665,8 +32317,8 @@
+@@ -31665,8 +34259,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -27504,7 +34286,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
-@@ -31758,22 +32410,22 @@
+@@ -31758,22 +34352,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -27533,7 +34315,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31806,14 +32458,14 @@
+@@ -31806,14 +34400,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -27551,7 +34333,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31856,8 +32508,8 @@
+@@ -31856,8 +34450,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27562,7 +34344,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31868,21 +32520,21 @@
+@@ -31868,21 +34462,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27589,7 +34371,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31925,8 +32577,8 @@
+@@ -31925,8 +34519,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27600,7 +34382,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31937,22 +32589,22 @@
+@@ -31937,22 +34531,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27628,7 +34410,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31995,8 +32647,8 @@
+@@ -31995,8 +34589,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27639,7 +34421,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -32009,21 +32661,21 @@
+@@ -32009,21 +34603,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27666,7 +34448,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32066,8 +32718,8 @@
+@@ -32066,8 +34660,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27677,7 +34459,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32080,22 +32732,22 @@
+@@ -32080,22 +34674,22 @@
{ (exit 1); exit 1; }; }
else
@@ -27705,7 +34487,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32138,12 +32790,12 @@
+@@ -32138,12 +34732,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27722,7 +34504,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32172,14 +32824,14 @@
+@@ -32172,14 +34766,14 @@
if test -n "$kde32ornewer"; then
@@ -27740,7 +34522,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32222,8 +32874,8 @@
+@@ -32222,8 +34816,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27751,7 +34533,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32234,21 +32886,21 @@
+@@ -32234,21 +34828,21 @@
{ (exit 1); exit 1; }; }
else
@@ -27778,7 +34560,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32291,8 +32943,8 @@
+@@ -32291,8 +34885,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27789,7 +34571,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32303,8 +32955,8 @@
+@@ -32303,8 +34897,8 @@
{ (exit 1); exit 1; }; }
else
@@ -27800,7 +34582,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32312,14 +32964,14 @@
+@@ -32312,14 +34906,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -27818,7 +34600,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32362,8 +33014,8 @@
+@@ -32362,8 +34956,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27829,7 +34611,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32374,8 +33026,8 @@
+@@ -32374,8 +34968,8 @@
{ (exit 1); exit 1; }; }
else
@@ -27840,7 +34622,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32383,14 +33035,14 @@
+@@ -32383,14 +34977,14 @@
fi
@@ -27858,7 +34640,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32433,12 +33085,12 @@
+@@ -32433,12 +35027,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27875,16 +34657,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32453,7 +33105,7 @@
+@@ -32453,7 +35047,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32456: $i/$j" >&5
-+ echo "configure: 33108: $i/$j" >&5
++ echo "configure: 35050: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32620,9 +33272,9 @@
+@@ -32620,9 +35214,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -27897,15 +34679,61 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32670,12 +33322,14 @@
+@@ -32644,24 +35238,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
+@@ -32670,12 +35276,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
@@ -27915,7 +34743,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -32687,13 +33341,12 @@
+@@ -32687,13 +35295,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -27931,18 +34759,104 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32701,77 +33354,29 @@
+@@ -32701,126 +35308,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++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
+- ac_cv_search_opendir="none required"
++ ac_cv_search_opendir=$ac_res
+ 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
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
+- builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -27974,73 +34888,21 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
+- ac_cv_search_opendir="-l$ac_lib"
+-break
-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
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
-@@ -32793,34 +33398,43 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++fi
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
-+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -28075,18 +34937,104 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32828,77 +33442,29 @@
+@@ -32828,122 +35408,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++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
+- ac_cv_search_opendir="none required"
++ ac_cv_search_opendir=$ac_res
+ 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
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
+- builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -28118,73 +35066,21 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
+- ac_cv_search_opendir="-l$ac_lib"
+-break
-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
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
-@@ -32920,30 +33486,40 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++fi
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
-+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -28215,18 +35111,65 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32993,8 +33569,9 @@
+@@ -32967,24 +35521,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
+@@ -32993,9 +35559,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
-@@ -33051,6 +33628,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -33051,6 +35618,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -28234,7 +35177,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33070,8 +33648,8 @@
+@@ -33070,18 +35638,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -28245,7 +35188,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -33094,12 +33672,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
+@@ -33094,12 +35671,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -28263,7 +35229,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33116,18 +33696,19 @@
+@@ -33116,18 +35695,19 @@
for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28291,17 +35257,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33164,15 +33745,16 @@
+@@ -33138,24 +35718,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
+@@ -33164,15 +35756,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; }
@@ -28313,7 +35325,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33206,9 +33788,10 @@
+@@ -33181,8 +35774,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
+@@ -33206,9 +35804,10 @@
ac_header_preproc=no
fi
@@ -28326,7 +35354,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33232,25 +33815,19 @@
+@@ -33232,25 +35831,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;}
@@ -28359,7 +35387,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33264,15 +33841,14 @@
+@@ -33264,15 +35857,14 @@
@@ -28378,7 +35406,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'
-@@ -33284,9 +33860,6 @@
+@@ -33284,9 +35876,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28388,18 +35416,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33335,8 +33908,9 @@
+@@ -33309,24 +35898,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
+@@ -33335,9 +35936,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"
-@@ -33350,11 +33924,11 @@
+ ac_ext=c
+@@ -33350,11 +35952,11 @@
fi
@@ -28415,7 +35490,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33375,8 +33949,7 @@
+@@ -33375,8 +35977,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -28425,7 +35500,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'
-@@ -33438,9 +34011,10 @@
+@@ -33411,24 +36012,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
+@@ -33438,10 +36051,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28433,11 +35553,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
-@@ -33454,8 +34028,8 @@
+ ac_ext=c
+@@ -33454,8 +36068,8 @@
fi
@@ -28448,7 +35570,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -33479,15 +34053,14 @@
+@@ -33479,15 +36093,14 @@
@@ -28467,7 +35589,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'
-@@ -33499,9 +34072,6 @@
+@@ -33499,9 +36112,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28477,18 +35599,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33550,8 +34120,9 @@
+@@ -33524,24 +36134,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
+@@ -33550,9 +36172,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"
-@@ -33565,11 +34136,11 @@
+ ac_ext=c
+@@ -33565,11 +36188,11 @@
fi
@@ -28504,7 +35673,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33590,8 +34161,7 @@
+@@ -33590,8 +36213,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -28514,7 +35683,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'
-@@ -33653,9 +34223,10 @@
+@@ -33626,24 +36248,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
+@@ -33653,10 +36287,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28522,11 +35736,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
-@@ -33669,8 +34240,8 @@
+ ac_ext=c
+@@ -33669,8 +36304,8 @@
fi
@@ -28537,7 +35753,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -33694,15 +34265,14 @@
+@@ -33694,15 +36329,14 @@
@@ -28556,7 +35772,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'
-@@ -33714,9 +34284,6 @@
+@@ -33714,9 +36348,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28566,18 +35782,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33767,8 +34334,9 @@
+@@ -33741,24 +36372,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
+@@ -33767,9 +36410,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"
-@@ -33782,11 +34350,11 @@
+ ac_ext=c
+@@ -33782,11 +36426,11 @@
fi
@@ -28593,7 +35856,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33807,8 +34375,7 @@
+@@ -33807,8 +36451,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -28603,7 +35866,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'
-@@ -33872,9 +34439,10 @@
+@@ -33845,24 +36488,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
+@@ -33872,10 +36527,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28611,11 +35919,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
-@@ -33888,8 +34456,8 @@
+ ac_ext=c
+@@ -33888,8 +36544,8 @@
fi
@@ -28626,7 +35936,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -33913,15 +34481,14 @@
+@@ -33913,15 +36569,14 @@
@@ -28645,7 +35955,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'
-@@ -33933,9 +34500,6 @@
+@@ -33933,9 +36588,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28655,18 +35965,65 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33987,8 +34551,9 @@
+@@ -33961,24 +36613,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
+@@ -33987,9 +36651,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_mkstemps=no
+ kde_cv_func_mkstemps=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"
-@@ -34002,11 +34567,11 @@
+ ac_ext=c
+@@ -34002,11 +36667,11 @@
fi
@@ -28682,7 +36039,7 @@
if test "${kde_cv_proto_mkstemps+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34027,8 +34592,7 @@
+@@ -34027,8 +36692,7 @@
if test "x$kde_cv_proto_mkstemps" = xunknown; then
@@ -28692,7 +36049,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'
-@@ -34093,9 +34657,10 @@
+@@ -34066,24 +36730,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
+@@ -34093,10 +36769,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28700,11 +36102,13 @@
+ kde_cv_proto_mkstemps="mkstemps 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
-@@ -34109,8 +34674,8 @@
+ ac_ext=c
+@@ -34109,8 +36786,8 @@
fi
@@ -28715,7 +36119,7 @@
if test "x$kde_cv_func_mkstemps" = xyes; then
-@@ -34132,8 +34697,8 @@
+@@ -34132,8 +36809,8 @@
@@ -28726,15 +36130,61 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34183,12 +34748,13 @@
+@@ -34157,24 +36834,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
+@@ -34183,12 +36872,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
@@ -28743,7 +36193,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34201,8 +34767,8 @@
+@@ -34201,8 +36891,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -28754,16 +36204,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -34214,7 +34780,7 @@
+@@ -34214,7 +36904,7 @@
do
for j in qsql.html;
do
- echo "configure: 34217: $i/$j" >&5
-+ echo "configure: 34783: $i/$j" >&5
++ echo "configure: 36907: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -34223,20 +34789,20 @@
+@@ -34223,20 +36913,20 @@
done
done
@@ -28789,7 +36239,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34279,12 +34845,12 @@
+@@ -34279,12 +36969,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28806,7 +36256,7 @@
DOT=$kde_cv_path
fi
-@@ -34296,14 +34862,14 @@
+@@ -34296,14 +36986,14 @@
fi
@@ -28824,7 +36274,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34346,12 +34912,12 @@
+@@ -34346,12 +37036,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28841,7 +36291,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -34385,35 +34951,35 @@
+@@ -34385,35 +37075,35 @@
# Process user input to configure
@@ -28893,7 +36343,7 @@
if test "${ac_cv_prog_gphoto2_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34426,30 +34992,32 @@
+@@ -34426,30 +37116,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -28933,7 +36383,7 @@
if test "${ac_cv_prog_gphoto2_port_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34462,26 +35030,28 @@
+@@ -34462,26 +37154,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -28967,28 +36417,168 @@
if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
then
with_kamera="yes"
-@@ -34556,6 +35126,7 @@
+@@ -34515,24 +37209,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
+@@ -34556,7 +37262,8 @@
done
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
#
LIBS="$ac_gphoto2_save_LIBS"
-@@ -34632,6 +35203,7 @@
+
+@@ -34592,24 +37299,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
+@@ -34632,7 +37351,8 @@
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
#
-@@ -34718,13 +35290,14 @@
+ LIBS="$ac_gphoto2_save_LIBS"
+@@ -34681,24 +37401,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
+@@ -34718,13 +37450,14 @@
with_kamera="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_gphoto2_save_LIBS"
CFLAGS="$ac_gphoto2_save_CFLAGS"
@@ -29000,15 +36590,61 @@
if test "${ac_cv_c_va_copy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34772,14 +35345,15 @@
+@@ -34746,24 +37479,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
+@@ -34772,14 +37517,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_va_copy="no"
+ ac_cv_c_va_copy="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
@@ -29019,7 +36655,7 @@
if test "$ac_cv_c_va_copy" = "yes"
then
-@@ -34788,8 +35362,8 @@
+@@ -34788,8 +37534,8 @@
_ACEOF
fi
@@ -29030,15 +36666,61 @@
if test "${ac_cv_c___va_copy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34837,14 +35411,15 @@
+@@ -34811,24 +37557,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
+@@ -34837,14 +37595,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c___va_copy="no"
+ ac_cv_c___va_copy="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
@@ -29049,7 +36731,7 @@
if test "$ac_cv_c___va_copy" = "yes"
then
-@@ -34869,8 +35444,8 @@
+@@ -34869,8 +37628,8 @@
test "$gphoto2_libraries" = "none" && gphoto2_libraries_result="(none)"
test "$gphoto2_includes" = "none" && gphoto2_includes_result="(none)"
@@ -29060,7 +36742,7 @@
if test "$with_kamera" = "no"; then
-@@ -34891,14 +35466,14 @@
+@@ -34891,14 +37650,14 @@
if test "$compile_kdvi" = "yes"; then
@@ -29078,7 +36760,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34941,12 +35516,12 @@
+@@ -34941,12 +37700,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29095,7 +36777,7 @@
KPSEWHICH=$kde_cv_path
fi
-@@ -34964,18 +35539,19 @@
+@@ -34964,18 +37723,19 @@
for ac_header in sys/types.h sys/params.h limits.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29123,17 +36805,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35012,15 +35588,16 @@
+@@ -34986,24 +37746,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
+@@ -35012,15 +37784,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; }
@@ -29145,7 +36873,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35054,9 +35631,10 @@
+@@ -35029,8 +37802,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
+@@ -35054,9 +37832,10 @@
ac_header_preproc=no
fi
@@ -29158,7 +36902,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35080,25 +35658,19 @@
+@@ -35080,25 +37859,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;}
@@ -29191,7 +36935,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35113,14 +35685,14 @@
+@@ -35113,14 +37886,14 @@
# Check for freetype2
@@ -29209,7 +36953,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35163,12 +35735,12 @@
+@@ -35163,12 +37936,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29226,10 +36970,10 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -35209,13 +35781,13 @@
+@@ -35207,13 +37980,13 @@
+ fi
-
-# Check whether --with-openexr or --without-openexr was given.
+# Check whether --with-openexr was given.
if test "${with_openexr+set}" = set; then
@@ -29244,7 +36988,7 @@
if test "x$with_openexr" != xno; then
-@@ -35228,8 +35800,8 @@
+@@ -35226,8 +37999,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
@@ -29255,7 +36999,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35244,56 +35816,56 @@
+@@ -35242,56 +38015,56 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -29312,7 +37056,7 @@
+echo "${ECHO_T}no" >&6; }
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.0" OpenEXR`) ; then
+ if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
@@ -29320,7 +37064,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
-
- ac_ext=cc
@@ -29328,7 +37072,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'
-@@ -35354,9 +35926,10 @@
+@@ -35326,24 +38099,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
+@@ -35352,10 +38137,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29336,11 +37125,13 @@
+ eval "ac_cv_libexr=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"
-@@ -35376,11 +35949,11 @@
+ CXXFLAGS="$kde_save_CXXFLAGS"
+@@ -35374,11 +38160,11 @@
_ACEOF
LIB_EXR="$ac_cv_libexr"
@@ -29356,7 +37147,7 @@
LIB_EXR=""
fi
fi
-@@ -35409,13 +35982,13 @@
+@@ -35407,13 +38193,13 @@
@@ -29374,7 +37165,7 @@
# Compile the pdf meta info plugin only if Poppler is available
if test "x$with_poppler" != xno; then
-@@ -35425,8 +35998,8 @@
+@@ -35423,8 +38209,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
@@ -29385,7 +37176,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35441,28 +36014,29 @@
+@@ -35439,28 +38225,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -29421,7 +37212,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -35473,25 +36047,25 @@
+@@ -35471,25 +38258,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -29459,7 +37250,7 @@
else
POPPLER_CFLAGS=""
POPPLER_LIBS=""
-@@ -35542,16 +36116,15 @@
+@@ -35540,16 +38327,15 @@
@@ -29479,15 +37270,62 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35619,6 +36192,7 @@
+@@ -35585,24 +38371,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
+@@ -35617,7 +38415,8 @@
kde_cv_libtiff_tiff=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
-@@ -35635,20 +36209,19 @@
+ LIBS="$kde_save_LIBS"
+@@ -35633,20 +38432,19 @@
if test "$kde_cv_libtiff_tiff" = "no"; then
@@ -29513,15 +37351,62 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35716,6 +36289,7 @@
+@@ -35682,24 +38480,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
+@@ -35714,7 +38524,8 @@
kde_cv_libtiff_tiff34=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
-@@ -35732,14 +36306,14 @@
+ LIBS="$kde_save_LIBS"
+@@ -35730,14 +38541,14 @@
if test "$kde_cv_libtiff_tiff34" = "no"; then
@@ -29540,7 +37425,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTIFF 1
-@@ -35751,8 +36325,8 @@
+@@ -35749,8 +38560,8 @@
else
LIBTIFF="$kde_cv_libtiff_tiff"
@@ -29551,7 +37436,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTIFF 1
-@@ -35781,8 +36355,8 @@
+@@ -35779,8 +38590,8 @@
@@ -29562,7 +37447,52 @@
if test "${ac_cv_lib_vm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -35837,10 +36411,11 @@
+@@ -35809,24 +38620,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
+@@ -35835,11 +38658,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29572,11 +37502,13 @@
+echo "${ECHO_T}no" >&6; }
eval "ac_cv_lib_vm=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"
-@@ -35852,11 +36427,11 @@
+ CFLAGS=$kgamma_save_CFLAGS
+@@ -35850,11 +38674,11 @@
if eval "test ! \"`echo $ac_cv_lib_vm`\" = no"; then
LIBVM="$ac_cv_lib_vm"
@@ -29592,9 +37524,50 @@
if test "${ac_cv_lib_vmgamma+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -35902,17 +36477,18 @@
+@@ -35879,39 +38703,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_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
-echo "${ECHO_T}yes" >&6
@@ -29611,11 +37584,13 @@
+echo "${ECHO_T}no" >&6; }
eval "ac_cv_lib_vm=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"
-@@ -35927,8 +36503,7 @@
+ CFLAGS=$kgamma_save_CFLAGS
+@@ -35925,8 +38762,7 @@
fi
@@ -29625,7 +37600,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'
-@@ -35942,18 +36517,19 @@
+@@ -35940,18 +38776,19 @@
for ac_header in sstream
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29653,17 +37628,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35990,15 +36566,16 @@
+@@ -35962,24 +38799,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
+@@ -35988,15 +38837,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; }
@@ -29675,7 +37696,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36032,9 +36609,10 @@
+@@ -36005,8 +38855,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
+@@ -36030,9 +38885,10 @@
ac_header_preproc=no
fi
@@ -29688,7 +37725,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36058,25 +36636,19 @@
+@@ -36056,25 +38912,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;}
@@ -29721,7 +37758,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36097,22 +36669,22 @@
+@@ -36095,22 +38945,22 @@
@@ -29752,7 +37789,7 @@
KADMOS_INC=
KADMOS_LIB=
-@@ -36143,14 +36715,14 @@
+@@ -36141,14 +38991,14 @@
@@ -29770,7 +37807,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36193,15 +36765,15 @@
+@@ -36191,15 +39041,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29790,7 +37827,7 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -36253,8 +36825,8 @@
+@@ -36251,8 +39101,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
@@ -29801,7 +37838,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36269,28 +36841,29 @@
+@@ -36267,28 +39117,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -29837,7 +37874,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -36301,25 +36874,25 @@
+@@ -36299,25 +39150,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -29875,7 +37912,7 @@
else
XFT_CFLAGS=""
XFT_LIBS=""
-@@ -36342,14 +36915,14 @@
+@@ -36340,14 +39191,14 @@
else
# This older xft-config stuff can (eventually) go away.
@@ -29893,7 +37930,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36392,12 +36965,12 @@
+@@ -36390,12 +39241,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -29910,7 +37947,7 @@
XFT_CONFIG=$kde_cv_path
fi
-@@ -36422,8 +36995,7 @@
+@@ -36420,8 +39271,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -29920,7 +37957,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'
-@@ -36433,17 +37005,17 @@
+@@ -36431,17 +39281,17 @@
if test "${ac_cv_header_paper_h+set}" = set; then
@@ -29944,17 +37981,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36480,15 +37052,16 @@
+@@ -36452,24 +39302,36 @@
+ #include <paper.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
+@@ -36478,15 +39340,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; }
@@ -29966,7 +38049,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36522,9 +37095,10 @@
+@@ -36495,8 +39358,13 @@
+ /* end confdefs.h. */
+ #include <paper.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
+@@ -36520,9 +39388,10 @@
ac_header_preproc=no
fi
@@ -29979,7 +38078,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36548,25 +37122,18 @@
+@@ -36546,25 +39415,18 @@
echo "$as_me: WARNING: paper.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: paper.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: paper.h: in the future, the compiler will take precedence" >&2;}
@@ -30010,7 +38109,7 @@
fi
if test $ac_cv_header_paper_h = yes; then
-@@ -36605,9 +37172,9 @@
+@@ -36603,9 +39465,9 @@
for ac_func in fseek64 mkstemp mkstemps popen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -30023,7 +38122,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36633,30 +37200,24 @@
+@@ -36631,53 +39493,59 @@
#undef $ac_func
@@ -30059,15 +38158,59 @@
;
return 0;
}
-@@ -36688,13 +37249,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
+@@ -36686,13 +39554,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
@@ -30078,16 +38221,16 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -36710,7 +37273,7 @@
+@@ -36708,7 +39578,7 @@
do
for j in xpdfrc;
do
-- echo "configure: 36713: $i/$j" >&5
-+ echo "configure: 37276: $i/$j" >&5
+- echo "configure: 36711: $i/$j" >&5
++ echo "configure: 39581: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
xpdfrc=$i
-@@ -36728,15 +37291,15 @@
+@@ -36726,15 +39596,15 @@
fi
@@ -30108,7 +38251,7 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36744,8 +37307,8 @@
+@@ -36742,8 +39612,8 @@
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@@ -30119,41 +38262,119 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36769,7 +37332,7 @@
+@@ -36767,25 +39637,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=$?
-@@ -36796,10 +37359,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
+@@ -36794,28 +39676,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=$?
-@@ -36826,7 +37391,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
+@@ -36824,22 +39720,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
-@@ -36834,14 +37401,14 @@
+ CC=$ac_save_CC
rm -f conftest.$ac_ext
fi
fi
@@ -30172,24 +38393,117 @@
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36897,7 +37464,9 @@
+@@ -36869,24 +39767,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
+@@ -36895,8 +39805,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. */
-@@ -36950,13 +37519,15 @@
+ _ACEOF
+@@ -36922,24 +39834,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
+@@ -36948,13 +39872,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
@@ -30200,7 +38514,7 @@
if test "$ac_cv_sys_file_offset_bits" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -36965,8 +37536,8 @@
+@@ -36963,8 +39889,8 @@
fi
rm -f conftest*
@@ -30211,24 +38525,117 @@
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37022,7 +37593,9 @@
+@@ -36994,24 +39920,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
+@@ -37020,8 +39958,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. */
-@@ -37075,13 +37648,15 @@
+ _ACEOF
+@@ -37047,24 +39987,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
+@@ -37073,13 +40025,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
@@ -30239,7 +38646,7 @@
if test "$ac_cv_sys_large_files" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -37101,8 +37676,8 @@
+@@ -37099,8 +40053,8 @@
fi
@@ -30250,24 +38657,117 @@
if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37150,7 +37725,9 @@
+@@ -37122,24 +40076,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
+@@ -37148,8 +40114,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. */
-@@ -37195,13 +37772,15 @@
+ _ACEOF
+@@ -37167,24 +40135,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
+@@ -37193,13 +40173,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
@@ -30278,7 +38778,7 @@
if test "$ac_cv_sys_largefile_source" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -37214,8 +37793,8 @@
+@@ -37212,8 +40194,8 @@
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
# in glibc 2.1.3, but that breaks too many other things.
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
@@ -30289,15 +38789,61 @@
if test "${ac_cv_func_fseeko+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37261,13 +37840,14 @@
+@@ -37233,24 +40215,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
+@@ -37259,13 +40253,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_fseeko=no
+ ac_cv_func_fseeko=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_fseeko" >&5
@@ -30307,7 +38853,7 @@
if test $ac_cv_func_fseeko = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -37280,9 +37860,9 @@
+@@ -37278,9 +40273,9 @@
for ac_func in fseek64
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -30320,7 +38866,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37308,30 +37888,24 @@
+@@ -37306,53 +40301,59 @@
#undef $ac_func
@@ -30356,15 +38902,59 @@
;
return 0;
}
-@@ -37363,13 +37937,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
+@@ -37361,13 +40362,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
@@ -30375,7 +38965,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37384,9 +37960,9 @@
+@@ -37382,9 +40385,9 @@
for ac_func in ftell64
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -30388,7 +38978,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37412,30 +37988,24 @@
+@@ -37410,53 +40413,59 @@
#undef $ac_func
@@ -30424,15 +39014,59 @@
;
return 0;
}
-@@ -37467,13 +38037,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
+@@ -37465,13 +40474,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
@@ -30443,7 +39077,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37496,10 +38068,9 @@
+@@ -37494,10 +40505,9 @@
fi
@@ -30456,7 +39090,7 @@
case $enableval in
yes)
-@@ -37532,12 +38103,12 @@
+@@ -37530,12 +40540,12 @@
_ACEOF
@@ -30473,17 +39107,17 @@
case $enableval in
yes)
-@@ -37570,19 +38141,19 @@
+@@ -37568,19 +40578,19 @@
_ACEOF
-fi;
+fi
-+
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-regmove" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-regmove... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-regmove" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-regmove... $ECHO_C" >&6; }
kde_cache=`echo fno-regmove | sed 'y% .=/+-,%____p__%'`
@@ -30499,17 +39133,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'
-@@ -37635,7 +38206,9 @@
+@@ -37607,24 +40617,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
+@@ -37633,8 +40655,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"
-@@ -37649,13 +38222,13 @@
+ ac_ext=c
+@@ -37647,13 +40671,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -30527,7 +39208,7 @@
:
SUPPORTS_NOREGMOVE=false
fi
-@@ -37675,10 +38248,9 @@
+@@ -37673,10 +40697,9 @@
@@ -30539,7 +39220,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'
-@@ -37693,18 +38265,19 @@
+@@ -37691,18 +40714,19 @@
for ac_header in GL/gl.h GL/glu.h GL/glx.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30567,17 +39248,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37741,15 +38314,16 @@
+@@ -37713,24 +40737,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
+@@ -37739,15 +40775,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; }
@@ -30589,7 +39316,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37783,9 +38357,10 @@
+@@ -37756,8 +40793,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
+@@ -37781,9 +40823,10 @@
ac_header_preproc=no
fi
@@ -30602,7 +39345,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37809,25 +38384,19 @@
+@@ -37807,25 +40850,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;}
@@ -30635,7 +39378,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -37864,28 +38433,27 @@
+@@ -37862,28 +40899,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -30671,18 +39414,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'
-@@ -37947,8 +38515,9 @@
+@@ -37919,24 +40955,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
+@@ -37945,9 +40993,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
-@@ -37964,8 +38533,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -37962,8 +41011,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -30693,7 +39483,7 @@
GL_LDFLAGS=""
GLINC=""
can_link_gl=no
-@@ -37985,8 +38554,8 @@
+@@ -37983,8 +41032,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -30704,7 +39494,7 @@
can_link_gl=yes
fi
fi
-@@ -38008,14 +38577,14 @@
+@@ -38006,14 +41055,14 @@
@@ -30722,7 +39512,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38058,12 +38627,12 @@
+@@ -38056,12 +41105,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30739,7 +39529,7 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -38090,8 +38659,8 @@
+@@ -38088,8 +41137,8 @@
#define HAVE_FREETYPE 1
_ACEOF
@@ -30750,7 +39540,7 @@
else
{ echo "$as_me:$LINENO: WARNING: You need at least libfreetype 5.0" >&5
echo "$as_me: WARNING: You need at least libfreetype 5.0" >&2;}
-@@ -38107,10 +38676,9 @@
+@@ -38105,10 +41154,9 @@
@@ -30762,7 +39552,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'
-@@ -38123,9 +38691,9 @@
+@@ -38121,9 +41169,9 @@
for ac_header in X11/extensions/shape.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30775,15 +39565,61 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38168,12 +38736,14 @@
+@@ -38140,24 +41188,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
+@@ -38166,12 +41226,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
@@ -30793,7 +39629,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -38194,14 +38764,14 @@
+@@ -38192,14 +41254,14 @@
# Check for libart
@@ -30811,7 +39647,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38244,12 +38814,12 @@
+@@ -38242,12 +41304,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30828,7 +39664,7 @@
LIBART_CONFIG=$kde_cv_path
fi
-@@ -38289,14 +38859,14 @@
+@@ -38287,14 +41349,14 @@
# Check for fontconfig
@@ -30846,7 +39682,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38339,18 +38909,18 @@
+@@ -38337,18 +41399,18 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30870,7 +39706,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38393,12 +38963,12 @@
+@@ -38391,12 +41453,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30887,7 +39723,7 @@
PKG_CONFIG=$kde_cv_path
fi
-@@ -38410,8 +38980,8 @@
+@@ -38408,8 +41470,8 @@
fi
else
@@ -30898,7 +39734,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -38458,14 +39028,14 @@
+@@ -38456,14 +41518,14 @@
# Check for freetype2
@@ -30916,7 +39752,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38508,12 +39078,12 @@
+@@ -38506,12 +41568,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30933,7 +39769,7 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -38567,8 +39137,7 @@
+@@ -38565,8 +41627,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -30943,7 +39779,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'
-@@ -38578,17 +39147,17 @@
+@@ -38576,17 +41637,17 @@
if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
@@ -30967,17 +39803,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38625,15 +39194,16 @@
+@@ -38597,24 +41658,36 @@
+ #include <lcms/lcms.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
+@@ -38623,15 +41696,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; }
@@ -30989,7 +39871,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38667,9 +39237,10 @@
+@@ -38640,8 +41714,13 @@
+ /* end confdefs.h. */
+ #include <lcms/lcms.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
+@@ -38665,9 +41744,10 @@
ac_header_preproc=no
fi
@@ -31002,7 +39900,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38693,25 +39264,18 @@
+@@ -38691,25 +41771,18 @@
echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;}
@@ -31033,7 +39931,7 @@
fi
if test $ac_cv_header_lcms_lcms_h = yes; then
-@@ -38741,8 +39305,7 @@
+@@ -38739,8 +41812,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -31043,7 +39941,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'
-@@ -38752,17 +39315,17 @@
+@@ -38750,17 +41822,17 @@
if test "${ac_cv_header_lcms_h+set}" = set; then
@@ -31067,17 +39965,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38799,15 +39362,16 @@
+@@ -38771,24 +41843,36 @@
+ #include <lcms.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
+@@ -38797,15 +41881,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; }
@@ -31089,7 +40033,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38841,9 +39405,10 @@
+@@ -38814,8 +41899,13 @@
+ /* end confdefs.h. */
+ #include <lcms.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
+@@ -38839,9 +41929,10 @@
ac_header_preproc=no
fi
@@ -31102,7 +40062,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38867,25 +39432,18 @@
+@@ -38865,25 +41956,18 @@
echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
@@ -31133,7 +40093,7 @@
fi
if test $ac_cv_header_lcms_h = yes; then
-@@ -38952,14 +39510,14 @@
+@@ -38950,14 +42034,14 @@
# Check for fribidi
@@ -31151,7 +40111,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39002,12 +39560,12 @@
+@@ -39000,12 +42084,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31168,7 +40128,7 @@
FRIBIDI_CONFIG=$kde_cv_path
fi
-@@ -39046,8 +39604,7 @@
+@@ -39044,8 +42128,7 @@
fi
@@ -31178,7 +40138,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'
-@@ -39060,18 +39617,19 @@
+@@ -39058,18 +42141,19 @@
for ac_header in sstream
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31206,17 +40166,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39108,15 +39666,16 @@
+@@ -39080,24 +42164,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
+@@ -39106,15 +42202,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; }
@@ -31228,7 +40234,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39150,9 +39709,10 @@
+@@ -39123,8 +42220,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
+@@ -39148,9 +42250,10 @@
ac_header_preproc=no
fi
@@ -31241,7 +40263,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -39176,25 +39736,19 @@
+@@ -39174,25 +42277,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;}
@@ -31274,7 +40296,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39269,8 +39823,8 @@
+@@ -39266,8 +42363,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
@@ -31285,7 +40307,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39285,28 +39839,29 @@
+@@ -39282,28 +42379,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -31321,7 +40343,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -39317,25 +39872,25 @@
+@@ -39314,25 +42412,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -31359,7 +40381,7 @@
else
IMLIB_CFLAGS=""
IMLIB_LIBS=""
-@@ -39358,57 +39913,57 @@
+@@ -39355,57 +42453,57 @@
else
@@ -31435,7 +40457,7 @@
fi
fi
fi
-@@ -39462,20 +40017,19 @@
+@@ -39459,20 +42557,19 @@
# C++
@@ -31460,21 +40482,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39530,10 +40084,11 @@
+@@ -39501,24 +42598,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
+@@ -39527,10 +42636,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_bool=no
+ ac_cv_cxx_bool=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39541,8 +40096,8 @@
+@@ -39538,8 +42648,8 @@
fi
@@ -31485,7 +40553,7 @@
if test "$ac_cv_cxx_bool" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -39551,14 +40106,13 @@
+@@ -39548,14 +42658,13 @@
fi
@@ -31503,21 +40571,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39609,10 +40163,11 @@
+@@ -39580,24 +42689,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
+@@ -39606,10 +42727,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_exceptions=no
+ ac_cv_cxx_exceptions=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39620,8 +40175,8 @@
+@@ -39617,8 +42739,8 @@
fi
@@ -31528,7 +40642,7 @@
if test "$ac_cv_cxx_exceptions" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -39630,14 +40185,13 @@
+@@ -39627,14 +42749,13 @@
fi
@@ -31546,21 +40660,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39688,10 +40242,11 @@
+@@ -39659,24 +42780,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
+@@ -39685,10 +42818,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_typename=no
+ ac_cv_cxx_typename=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39699,8 +40254,8 @@
+@@ -39696,8 +42830,8 @@
fi
@@ -31571,7 +40731,7 @@
if test "$ac_cv_cxx_typename" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -39709,14 +40264,13 @@
+@@ -39706,14 +42840,13 @@
fi
@@ -31589,21 +40749,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39769,10 +40323,11 @@
+@@ -39740,24 +42873,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
+@@ -39766,10 +42911,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_stdincludes=no
+ ac_cv_cxx_stdincludes=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39780,8 +40335,8 @@
+@@ -39777,8 +42923,8 @@
fi
@@ -31614,7 +40820,7 @@
if test "$ac_cv_cxx_stdincludes" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -39790,14 +40345,13 @@
+@@ -39787,14 +42933,13 @@
fi
@@ -31632,21 +40838,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39848,10 +40402,11 @@
+@@ -39819,24 +42964,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
+@@ -39845,10 +43002,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_namespaces=no
+ ac_cv_cxx_namespaces=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39859,8 +40414,8 @@
+@@ -39856,8 +43014,8 @@
fi
@@ -31657,7 +40909,7 @@
if test "$ac_cv_cxx_namespaces" = yes && test "$ac_debug" = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -39869,14 +40424,13 @@
+@@ -39866,14 +43024,13 @@
fi
@@ -31675,21 +40927,67 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39931,10 +40485,11 @@
+@@ -39902,24 +43059,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
+@@ -39928,10 +43097,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_cxx_member_templates=no
+ ac_cv_cxx_member_templates=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=cc
+
- 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'
-@@ -39942,8 +40497,8 @@
+@@ -39939,8 +43109,8 @@
fi
@@ -31700,7 +40998,7 @@
if test "$ac_cv_cxx_member_templates" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -39956,13 +40511,13 @@
+@@ -39953,13 +43123,13 @@
RPO_YES='#'
RPO_NO=''
if test x$GXX = xyes ; then
@@ -31718,7 +41016,7 @@
if test x$ac_rpo != xno ; then
CXXRPOFLAGS='-frepo -fno-rtti'
RPO_YES=''
-@@ -39979,8 +40534,8 @@
+@@ -39976,8 +43146,8 @@
# ----------------------------------------
@@ -31729,7 +41027,7 @@
if test "${ac_cv_lib_m_sqrt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39993,17 +40548,17 @@
+@@ -39990,40 +43160,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31751,15 +41049,59 @@
;
return 0;
}
-@@ -40035,14 +40590,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
+@@ -40032,14 +43214,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_sqrt=no
+ ac_cv_lib_m_sqrt=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
@@ -31770,7 +41112,7 @@
if test $ac_cv_lib_m_sqrt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -40053,8 +40609,8 @@
+@@ -40050,8 +43233,8 @@
fi
@@ -31781,7 +41123,7 @@
if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40067,17 +40623,17 @@
+@@ -40064,40 +43247,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31803,15 +41145,59 @@
;
return 0;
}
-@@ -40109,14 +40665,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
+@@ -40106,14 +43301,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_iconv_libiconv=no
+ ac_cv_lib_iconv_libiconv=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
@@ -31822,7 +41208,7 @@
if test $ac_cv_lib_iconv_libiconv = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBICONV 1
-@@ -40131,8 +40688,8 @@
+@@ -40128,8 +43324,8 @@
# Header Files
# ----------------------------------------
@@ -31833,18 +41219,65 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40182,8 +40739,9 @@
+@@ -40153,24 +43349,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
+@@ -40179,9 +43387,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
-@@ -40240,6 +40798,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -40237,6 +43446,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -31852,7 +41285,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -40259,8 +40818,8 @@
+@@ -40256,18 +43466,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -31863,7 +41296,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -40283,12 +40842,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
+@@ -40280,12 +43499,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -31881,7 +41337,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40305,9 +40866,9 @@
+@@ -40302,9 +43523,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -31894,15 +41350,61 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40355,12 +40916,14 @@
+@@ -40326,24 +43547,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
+@@ -40352,12 +43585,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
@@ -31912,7 +41414,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -40372,13 +40935,12 @@
+@@ -40369,13 +43604,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -31928,18 +41430,104 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40386,77 +40948,29 @@
+@@ -40383,126 +43617,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++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
+- ac_cv_search_opendir="none required"
++ ac_cv_search_opendir=$ac_res
+ 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
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
+- builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -31971,73 +41559,21 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
+- ac_cv_search_opendir="-l$ac_lib"
+-break
-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
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
-@@ -40478,34 +40992,43 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++fi
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
-+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -32072,18 +41608,104 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40513,77 +41036,29 @@
+@@ -40510,122 +43717,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ rm -f conftest.$ac_objext conftest$ac_exeext
++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
+- ac_cv_search_opendir="none required"
++ ac_cv_search_opendir=$ac_res
+ 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
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
+- builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -32115,73 +41737,21 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
+- ac_cv_search_opendir="-l$ac_lib"
+-break
-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
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
-@@ -40605,30 +41080,40 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++fi
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
-+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -32212,15 +41782,61 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40678,12 +41163,13 @@
+@@ -40649,24 +43830,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
+@@ -40675,12 +43868,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
@@ -32229,7 +41845,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40692,8 +41178,8 @@
+@@ -40689,8 +43883,8 @@
fi
@@ -32240,7 +41856,7 @@
if test "${ac_cv_header_sys_wait_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40706,7 +41192,7 @@
+@@ -40703,7 +43897,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#ifndef WEXITSTATUS
@@ -32249,15 +41865,61 @@
#endif
#ifndef WIFEXITED
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -40749,12 +41235,13 @@
+@@ -40720,24 +43914,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
+@@ -40746,12 +43952,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_sys_wait_h=no
+ ac_cv_header_sys_wait_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_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
@@ -32266,7 +41928,7 @@
if test $ac_cv_header_sys_wait_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40770,18 +41257,19 @@
+@@ -40767,18 +43974,19 @@
for ac_header in wchar.h wctype.h sys/mman.h iconv.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32294,17 +41956,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40818,15 +41306,16 @@
+@@ -40789,24 +43997,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
+@@ -40815,15 +44035,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; }
@@ -32316,7 +42024,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40860,9 +41349,10 @@
+@@ -40832,8 +44053,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
+@@ -40857,9 +44083,10 @@
ac_header_preproc=no
fi
@@ -32329,7 +42053,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40886,25 +41376,19 @@
+@@ -40883,25 +44110,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;}
@@ -32362,7 +42086,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -40922,18 +41406,19 @@
+@@ -40919,18 +44140,19 @@
for ac_header in stdint.h sys/ipc.h sys/shm.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32390,17 +42114,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40970,15 +41455,16 @@
+@@ -40941,24 +44163,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
+@@ -40967,15 +44201,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; }
@@ -32412,7 +42182,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41012,9 +41498,10 @@
+@@ -40984,8 +44219,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
+@@ -41009,9 +44249,10 @@
ac_header_preproc=no
fi
@@ -32425,7 +42211,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41038,25 +41525,19 @@
+@@ -41035,25 +44276,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;}
@@ -32458,7 +42244,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41073,8 +41554,8 @@
+@@ -41070,8 +44305,8 @@
# Types
# ----------------------------------------
@@ -32469,7 +42255,7 @@
if test "${ac_cv_type_wchar_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41085,12 +41566,13 @@
+@@ -41082,36 +44317,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32485,15 +42271,60 @@
return 0;
;
return 0;
-@@ -41123,12 +41605,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_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
+@@ -41120,12 +44368,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_wchar_t=no
+ ac_cv_type_wchar_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_wchar_t" >&5
-echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
@@ -32502,7 +42333,7 @@
if test $ac_cv_type_wchar_t = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -41138,8 +41621,8 @@
+@@ -41135,8 +44384,8 @@
fi
@@ -32513,7 +42344,7 @@
if test "${ac_cv_type_long_long_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41150,12 +41633,13 @@
+@@ -41147,36 +44396,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32529,15 +42360,60 @@
return 0;
;
return 0;
-@@ -41188,12 +41672,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_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
+@@ -41185,12 +44447,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long_long_int=no
+ ac_cv_type_long_long_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_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
@@ -32546,7 +42422,7 @@
if test $ac_cv_type_long_long_int = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -41203,8 +41688,8 @@
+@@ -41200,8 +44463,8 @@
fi
@@ -32557,7 +42433,7 @@
if test "${ac_cv_type_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41216,12 +41701,13 @@
+@@ -41213,36 +44476,49 @@
/* end confdefs.h. */
#include "wchar.h"
@@ -32573,15 +42449,60 @@
return 0;
;
return 0;
-@@ -41254,12 +41740,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_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
+@@ -41251,12 +44527,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_mbstate_t=no
+ ac_cv_type_mbstate_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_mbstate_t" >&5
-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
@@ -32590,7 +42511,7 @@
if test $ac_cv_type_mbstate_t = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -41279,18 +41766,19 @@
+@@ -41276,18 +44553,19 @@
for ac_header in stdlib.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32618,17 +42539,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41327,15 +41815,16 @@
+@@ -41298,24 +44576,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
+@@ -41324,15 +44614,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; }
@@ -32640,7 +42607,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41369,9 +41858,10 @@
+@@ -41341,8 +44632,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
+@@ -41366,9 +44662,10 @@
ac_header_preproc=no
fi
@@ -32653,7 +42636,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41395,25 +41885,19 @@
+@@ -41392,25 +44689,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;}
@@ -32686,7 +42669,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41429,9 +41913,9 @@
+@@ -41426,9 +44717,9 @@
for ac_func in getpagesize
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32699,7 +42682,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41457,30 +41941,24 @@
+@@ -41454,53 +44745,59 @@
#undef $ac_func
@@ -32735,15 +42718,59 @@
;
return 0;
}
-@@ -41512,13 +41990,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
+@@ -41509,13 +44806,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
@@ -32754,7 +42781,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -41527,8 +42007,8 @@
+@@ -41524,8 +44823,8 @@
fi
done
@@ -32765,7 +42792,7 @@
if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41623,15 +42103,15 @@
+@@ -41620,15 +44919,15 @@
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
@@ -32784,7 +42811,7 @@
close (fd);
/* Next, try to mmap the file at a fixed address which already has
-@@ -41639,17 +42119,17 @@
+@@ -41636,17 +44935,17 @@
we see the same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
@@ -32807,7 +42834,7 @@
/* Finally, make sure that changes to the mapped area do not
percolate back to the file as seen by read(). (This is a bug on
-@@ -41658,14 +42138,14 @@
+@@ -41655,24 +44954,33 @@
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
@@ -32826,7 +42853,30 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -41688,11 +42168,13 @@
+-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
+@@ -41685,11 +44993,13 @@
( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no
fi
@@ -32843,7 +42893,7 @@
if test $ac_cv_func_mmap_fixed_mapped = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41702,8 +42184,8 @@
+@@ -41699,8 +45009,8 @@
fi
rm -f conftest.mmap
@@ -32854,7 +42904,7 @@
if test "${ac_cv_type_pid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41714,12 +42196,13 @@
+@@ -41711,36 +45021,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32870,15 +42920,60 @@
return 0;
;
return 0;
-@@ -41752,12 +42235,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_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
+@@ -41749,12 +45072,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_pid_t=no
+ ac_cv_type_pid_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_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
@@ -32887,7 +42982,7 @@
if test $ac_cv_type_pid_t = yes; then
:
else
-@@ -41769,22 +42253,22 @@
+@@ -41766,22 +45090,22 @@
fi
@@ -32920,17 +43015,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41821,15 +42305,16 @@
+@@ -41792,24 +45116,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
+@@ -41818,15 +45154,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; }
@@ -32942,7 +43083,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41863,9 +42348,10 @@
+@@ -41835,8 +45172,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
+@@ -41860,9 +45202,10 @@
ac_header_preproc=no
fi
@@ -32955,7 +43112,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41889,25 +42375,19 @@
+@@ -41886,25 +45229,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;}
@@ -32988,7 +43145,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41924,9 +42404,9 @@
+@@ -41921,9 +45258,9 @@
for ac_func in fork vfork
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33001,7 +43158,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41952,30 +42432,24 @@
+@@ -41949,53 +45286,59 @@
#undef $ac_func
@@ -33037,15 +43194,59 @@
;
return 0;
}
-@@ -42007,13 +42481,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
+@@ -42004,13 +45347,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
@@ -33056,7 +43257,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42023,8 +42499,8 @@
+@@ -42020,8 +45365,8 @@
done
if test "x$ac_cv_func_fork" = xyes; then
@@ -33067,7 +43268,7 @@
if test "${ac_cv_func_fork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42032,18 +42508,22 @@
+@@ -42029,27 +45374,40 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
@@ -33101,8 +43302,30 @@
+}
_ACEOF
rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -42065,11 +42545,13 @@
+-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
+@@ -42062,11 +45420,13 @@
( exit $ac_status )
ac_cv_func_fork_works=no
fi
@@ -33119,7 +43342,7 @@
else
ac_cv_func_fork_works=$ac_cv_func_fork
-@@ -42089,8 +42571,8 @@
+@@ -42086,8 +45446,8 @@
fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
if test "x$ac_cv_func_vfork" = xyes; then
@@ -33130,7 +43353,7 @@
if test "${ac_cv_func_vfork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42104,14 +42586,8 @@
+@@ -42101,14 +45461,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Thanks to Paul Eggert for this test. */
@@ -33146,7 +43369,7 @@
#if HAVE_VFORK_H
# include <vfork.h>
#endif
-@@ -42183,7 +42659,7 @@
+@@ -42180,7 +45534,7 @@
while (wait(&status) != child)
;
@@ -33155,7 +43378,34 @@
/* Was there some problem with vforking? */
child < 0
-@@ -42219,11 +42695,13 @@
+@@ -42197,13 +45551,22 @@
+ }
+ _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
+@@ -42216,11 +45579,13 @@
( exit $ac_status )
ac_cv_func_vfork_works=no
fi
@@ -33172,7 +43422,7 @@
fi;
if test "x$ac_cv_func_fork_works" = xcross; then
-@@ -42258,9 +42736,9 @@
+@@ -42255,9 +45620,9 @@
for ac_func in wcrtomb iswspace
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33185,7 +43435,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42286,30 +42764,24 @@
+@@ -42283,53 +45648,59 @@
#undef $ac_func
@@ -33221,15 +43471,59 @@
;
return 0;
}
-@@ -42341,13 +42813,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
+@@ -42338,13 +45709,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
@@ -33240,7 +43534,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42362,9 +42836,9 @@
+@@ -42359,9 +45732,9 @@
for ac_func in putc_unlocked strerror vsnprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33253,7 +43547,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42390,30 +42864,24 @@
+@@ -42387,53 +45760,59 @@
#undef $ac_func
@@ -33289,15 +43583,59 @@
;
return 0;
}
-@@ -42445,13 +42913,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
+@@ -42442,13 +45821,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
@@ -33308,7 +43646,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42467,9 +42937,9 @@
+@@ -42464,9 +45845,9 @@
for ac_func in gethostname iconv strftime getpwuid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33321,7 +43659,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42495,30 +42965,24 @@
+@@ -42492,53 +45873,59 @@
#undef $ac_func
@@ -33357,15 +43695,59 @@
;
return 0;
}
-@@ -42550,13 +43014,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
+@@ -42547,13 +45934,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
@@ -33376,7 +43758,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42576,13 +43042,13 @@
+@@ -42573,13 +45962,13 @@
ac_tiff=no
@@ -33394,7 +43776,7 @@
# Process specification
if test x$ac_tiff = xyes ; then
test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-ltiff"
-@@ -42592,8 +43058,8 @@
+@@ -42589,8 +45978,8 @@
fi
# Try linking
if test x$ac_tiff != xno ; then
@@ -33405,15 +43787,61 @@
save_CFLAGS="$CFLAGS"
save_CXXFLAGS="$CXXFLAGS"
save_LIBS="$LIBS"
-@@ -42651,15 +43117,16 @@
+@@ -42622,24 +46011,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
+@@ -42648,15 +46049,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_tiff=no
+ ac_tiff=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
CFLAGS="$save_CFLAGS"
CXXFLAGS="$save_CXXFLAGS"
@@ -33425,7 +43853,7 @@
fi
# Finish
if test x$ac_tiff = xno; then
-@@ -42673,23 +43140,23 @@
+@@ -42670,23 +46072,23 @@
#define HAVE_TIFF 1
_ACEOF
@@ -33457,7 +43885,7 @@
ac_threads=no
if test x$ac_use_threads != xno ; then
case x$ac_use_threads in
-@@ -42700,17 +43167,17 @@
+@@ -42697,17 +46099,17 @@
# First, check if the POSIX threads header, pthread.h, is available.
# If it isn't, don't bother looking for the threads libraries.
if test "${ac_cv_header_pthread_h+set}" = set; then
@@ -33481,17 +43909,63 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42747,15 +43214,16 @@
+@@ -42718,24 +46120,36 @@
+ #include <pthread.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
+@@ -42744,15 +46158,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; }
@@ -33503,7 +43977,23 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42789,9 +43257,10 @@
+@@ -42761,8 +46176,13 @@
+ /* end confdefs.h. */
+ #include <pthread.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
+@@ -42786,9 +46206,10 @@
ac_header_preproc=no
fi
@@ -33516,7 +44006,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42815,25 +43284,18 @@
+@@ -42812,25 +46233,18 @@
echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
@@ -33547,7 +44037,7 @@
fi
if test $ac_cv_header_pthread_h = yes; then
-@@ -42857,8 +43319,8 @@
+@@ -42854,8 +46268,8 @@
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
save_LIBS="$LIBS"
LIBS="$PTHREAD_LIBS $LIBS"
@@ -33558,7 +44048,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42866,17 +43328,17 @@
+@@ -42863,40 +46277,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33580,14 +44070,58 @@
;
return 0;
}
-@@ -42908,11 +43370,13 @@
+ _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
+@@ -42905,11 +46331,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
- echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
-echo "${ECHO_T}$acx_pthread_ok" >&6
@@ -33596,7 +44130,7 @@
if test x"$acx_pthread_ok" = xno; then
PTHREAD_LIBS=""
PTHREAD_CFLAGS=""
-@@ -42959,17 +43423,17 @@
+@@ -42956,17 +46384,17 @@
for flag in $acx_pthread_flags; do
case $flag in
none)
@@ -33620,14 +44154,60 @@
PTHREAD_LIBS="-l$flag"
;;
esac
-@@ -43032,14 +43496,16 @@
+@@ -43003,24 +46431,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
+@@ -43029,14 +46469,16 @@
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
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
@@ -33639,7 +44219,7 @@
if test "x$acx_pthread_ok" = xyes; then
break;
fi
-@@ -43055,15 +43521,15 @@
+@@ -43052,15 +46494,15 @@
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
@@ -33659,7 +44239,7 @@
if test "x$flag" != xno; then
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
fi
-@@ -43099,20 +43565,20 @@
+@@ -43096,20 +46538,20 @@
acx_cothread=no
if test x$GXX = xyes ; then
@@ -33687,15 +44267,61 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43161,21 +43627,22 @@
+@@ -43132,24 +46574,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
+@@ -43158,21 +46612,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-acx_cothread_patch=no
+ acx_cothread_patch=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=cc
+ ac_ext=cpp
@@ -33716,7 +44342,7 @@
echo 'void foo() { throw "Hello"; }' > conftest.cc
compile="$CXX $CXXFLAGS -c conftest.cc"
check="nm conftest.o | grep sjthrow | cat > conftest.out"
-@@ -43193,8 +43660,8 @@
+@@ -43190,8 +46645,8 @@
acx_cothread_patch=no
fi
fi
@@ -33727,7 +44353,7 @@
rm conftest.*
if test x$acx_cothread_patch = xyes ; then
acx_cothread=no
-@@ -43241,15 +43708,15 @@
+@@ -43238,15 +46693,15 @@
fi
@@ -33751,7 +44377,7 @@
:
else
no_threads=yes
-@@ -43272,14 +43739,14 @@
+@@ -43269,14 +46724,14 @@
@@ -33769,7 +44395,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43326,12 +43793,12 @@
+@@ -43323,12 +46778,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33786,7 +44412,7 @@
SANE_CONFIG=$kde_cv_path
fi
-@@ -43385,8 +43852,8 @@
+@@ -43382,8 +46837,8 @@
fi
for i in $ac_topsubdirs; do
@@ -33797,7 +44423,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -43397,8 +43864,8 @@
+@@ -43394,8 +46849,8 @@
else
install_it="no"
fi
@@ -33808,7 +44434,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -43630,297 +44097,297 @@
+@@ -43627,297 +47082,297 @@
kooka_SUBDIR_included_FALSE=
fi
@@ -34252,7 +44878,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -43940,39 +44407,58 @@
+@@ -43937,39 +47392,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -34327,7 +44953,7 @@
fi
fi
rm -f confcache
-@@ -43981,38 +44467,31 @@
+@@ -43978,38 +47452,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -34379,7 +45005,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
-@@ -44268,11 +44747,35 @@
+@@ -44265,11 +47732,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -34417,7 +45043,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -44281,8 +44784,43 @@
+@@ -44278,8 +47769,43 @@
fi
@@ -34462,7 +45088,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -44296,18 +44834,19 @@
+@@ -44293,18 +47819,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -34485,7 +45111,7 @@
as_basename=basename
else
as_basename=false
-@@ -44315,159 +44854,120 @@
+@@ -44312,159 +47839,120 @@
# Name of the executable.
@@ -34657,7 +45283,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
@@ -34716,7 +45342,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -44476,7 +44976,19 @@
+@@ -44473,7 +47961,19 @@
as_mkdir_p=false
fi
@@ -34737,7 +45363,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'"
-@@ -44485,31 +44997,14 @@
+@@ -44482,31 +47982,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -34769,11 +45395,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
-@@ -44517,30 +45012,20 @@
+@@ -44514,30 +47997,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -34812,7 +45438,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -44567,19 +45052,21 @@
+@@ -44564,19 +48037,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -34823,8 +45449,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.
@@ -34839,7 +45466,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -44590,39 +45077,24 @@
+@@ -44587,39 +48062,24 @@
do
case $1 in
--*=*)
@@ -34885,7 +45512,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -44632,18 +45104,24 @@
+@@ -44629,18 +48089,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -34915,16 +45542,16 @@
esac
shift
-@@ -44659,182 +45137,194 @@
+@@ -44656,182 +48122,194 @@
_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
@@ -35266,7 +45893,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
-@@ -44846,607 +45336,799 @@
+@@ -44843,607 +48321,799 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -35821,7 +46448,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
@@ -35833,10 +46460,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
@@ -35960,7 +46587,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
@@ -35971,10 +46598,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
@@ -36098,7 +46725,7 @@
+LCMS_LIBS!$LCMS_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
@@ -36109,10 +46736,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
@@ -36210,7 +46837,7 @@
+LIBOBJS!$LIBOBJS$ac_delim
+_ACEOF
+
-+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 71; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -36221,10 +46848,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
@@ -36578,7 +47205,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
@@ -36590,7 +47217,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;}
@@ -36612,7 +47239,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -45454,248 +46136,122 @@
+@@ -45451,248 +49121,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -36668,6 +47295,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".
@@ -36954,7 +47589,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -45706,135 +46262,39 @@
+@@ -45703,135 +49255,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -37116,7 +47751,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.
-@@ -45844,18 +46304,29 @@
+@@ -45841,18 +49297,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
@@ -37154,7 +47789,7 @@
else
continue
fi
-@@ -45877,53 +46348,79 @@
+@@ -45874,53 +49341,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -37267,7 +47902,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdegraphics, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdegraphics, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -37574,7 +48209,7 @@
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty 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
@@ -37583,14 +48218,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi
- @for base in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ @for base in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
++ @for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
done
uninstall-nls:
- for base in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ for base in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
++ for base in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdvi/$$base ;\
done
@@ -37598,7 +48233,7 @@
#>+ 5
distdir-nls:
- for file in kdvi-search.el aboutkde.ps KDVI-features.tex index.docbook srctex.sty srcltx.sty KDVI-features.dvi optionrequester1.png optionrequester2.png ; do \
-+ for file in optionrequester2.png aboutkde.ps index.docbook KDVI-features.dvi kdvi-search.el srctex.sty optionrequester1.png KDVI-features.tex srcltx.sty ; do \
++ for file in optionrequester1.png optionrequester2.png aboutkde.ps KDVI-features.dvi KDVI-features.tex kdvi-search.el srctex.sty srcltx.sty index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -37893,6 +48528,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -599,7 +608,7 @@
+ KDE_DIST=Makefile.in kiconedit-configuration.png index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kiconedit-configuration.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kiconedit-configuration.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
+@@ -626,20 +635,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit
+- @for base in index.docbook kiconedit-configuration.png ; do \
++ @for base in kiconedit-configuration.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kiconedit-configuration.png ; do \
++ for base in kiconedit-configuration.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kiconedit/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kiconedit-configuration.png ; do \
++ for file in kiconedit-configuration.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kolourpaint/Makefile.in
+++ doc/kolourpaint/Makefile.in
@@ -115,6 +115,7 @@
@@ -37995,11 +48663,11 @@
#>+ 2
-KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png fcc_std_text.png selections_opaque_transparent.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png lines_30_deg.png tool_free_form_selection.png image_reduce_colors.png line_width.png lines_45_deg.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png color_box.png image_resize_scale.png tool_rect_selection.png tool_elliptical_selection.png fill_style.png tool_polyline.png tool_ellipse.png text_zoom_grid.png image_rotate.png tool_line.png Makefile.in tool_selections.png tool_brush.png tool_polystar.png fcc_trans_text.png fill_color_similarity.png tool_text.png image_flip.png tool_rectangle.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png view_thumbnails.png tool_spraycan.png tool_flood_fill.png tool_eraser.png Makefile.am lines_30_45_deg.png index.cache.bz2
-+KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png selections_opaque_transparent.png fcc_std_text.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png lines_30_deg.png tool_free_form_selection.png image_reduce_colors.png line_width.png lines_45_deg.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png tool_rect_selection.png color_box.png image_resize_scale.png tool_elliptical_selection.png tool_polyline.png fill_style.png text_zoom_grid.png image_rotate.png tool_line.png tool_ellipse.png Makefile.in tool_brush.png tool_selections.png fcc_trans_text.png tool_polystar.png fill_color_similarity.png image_flip.png tool_text.png tool_rectangle.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png tool_spraycan.png tool_eraser.png tool_flood_fill.png view_thumbnails.png Makefile.am lines_30_45_deg.png index.cache.bz2
++KDE_DIST=image_flatten.png tool_curve.png tool_polygon.png fcc_std_text.png selections_opaque_transparent.png image_skew.png kolourpaint-main.png tool_rectangles.png brush_shapes.png spraycan_patterns.png tool_free_form_selection.png lines_30_deg.png image_reduce_colors.png lines_45_deg.png line_width.png index.docbook image_invert.png image_emboss.png tool_color_picker.png eraser_shapes.png image_resize_scale.png color_box.png tool_rect_selection.png tool_elliptical_selection.png fill_style.png tool_polyline.png image_rotate.png tool_ellipse.png tool_line.png text_zoom_grid.png Makefile.in tool_selections.png tool_brush.png fcc_trans_text.png tool_polystar.png fill_color_similarity.png image_flip.png tool_rectangle.png tool_text.png rotate_selection_30.png tool_rounded_rectangle.png image_balance.png rotate_image_30.png tool_color_washer.png tool_pen.png image_soften_sharpen.png view_thumbnails.png tool_flood_fill.png tool_eraser.png tool_spraycan.png Makefile.am lines_30_45_deg.png index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.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
@@ -38008,14 +48676,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint
- @for base in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ @for base in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
++ @for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
done
uninstall-nls:
- for base in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ for base in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
++ for base in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kolourpaint/$$base ;\
done
@@ -38023,7 +48691,7 @@
#>+ 5
distdir-nls:
- for file in text_zoom_grid.png image_flip.png spraycan_patterns.png image_flatten.png rotate_image_30.png image_rotate.png lines_45_deg.png rotate_selection_30.png lines_30_45_deg.png index.docbook tool_color_picker.png tool_selections.png fill_style.png tool_elliptical_selection.png tool_free_form_selection.png image_resize_scale.png tool_eraser.png tool_brush.png image_soften_sharpen.png tool_curve.png tool_rounded_rectangle.png eraser_shapes.png tool_rectangles.png tool_line.png image_balance.png line_width.png image_reduce_colors.png tool_polyline.png tool_rectangle.png lines_30_deg.png fill_color_similarity.png tool_rect_selection.png fcc_trans_text.png tool_pen.png selections_opaque_transparent.png tool_flood_fill.png fcc_std_text.png image_invert.png tool_polystar.png image_skew.png tool_spraycan.png tool_text.png tool_color_washer.png tool_polygon.png brush_shapes.png color_box.png view_thumbnails.png image_emboss.png tool_ellipse.png kolourpaint-main.png ; do \
-+ for file in tool_eraser.png lines_30_45_deg.png image_soften_sharpen.png tool_flood_fill.png color_box.png brush_shapes.png tool_polystar.png tool_color_picker.png tool_free_form_selection.png view_thumbnails.png image_invert.png image_resize_scale.png lines_45_deg.png line_width.png fcc_std_text.png kolourpaint-main.png tool_rectangle.png tool_line.png spraycan_patterns.png fill_style.png tool_ellipse.png image_emboss.png index.docbook tool_color_washer.png tool_selections.png tool_rounded_rectangle.png image_balance.png image_reduce_colors.png tool_curve.png selections_opaque_transparent.png tool_rectangles.png image_skew.png image_flatten.png tool_spraycan.png fill_color_similarity.png lines_30_deg.png tool_text.png image_rotate.png tool_polyline.png image_flip.png text_zoom_grid.png eraser_shapes.png tool_elliptical_selection.png tool_pen.png tool_brush.png tool_rect_selection.png rotate_image_30.png rotate_selection_30.png fcc_trans_text.png tool_polygon.png ; do \
++ for file in image_rotate.png tool_ellipse.png tool_polygon.png rotate_selection_30.png tool_rectangle.png tool_eraser.png line_width.png selections_opaque_transparent.png tool_spraycan.png tool_color_washer.png fcc_trans_text.png tool_line.png lines_30_deg.png tool_polystar.png image_flatten.png lines_45_deg.png tool_pen.png tool_selections.png image_reduce_colors.png tool_curve.png image_balance.png text_zoom_grid.png tool_brush.png image_skew.png kolourpaint-main.png tool_polyline.png tool_rect_selection.png lines_30_45_deg.png tool_text.png eraser_shapes.png tool_rounded_rectangle.png fill_color_similarity.png tool_color_picker.png image_emboss.png tool_free_form_selection.png color_box.png spraycan_patterns.png tool_rectangles.png image_flip.png tool_flood_fill.png image_resize_scale.png view_thumbnails.png index.docbook fcc_std_text.png image_invert.png fill_style.png tool_elliptical_selection.png rotate_image_30.png brush_shapes.png image_soften_sharpen.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -38129,11 +48797,11 @@
#>+ 2
-KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png shortcut0.png ocr-select.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
-+KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png ocr-select.png shortcut0.png Makefile.in toolbar.png toolbar1.png Makefile.am index.cache.bz2
++KDE_DIST=kooka_mainctrl.png toolbar2.png index.docbook kooka_gocr.png kooka_gocr_result.png shortcut1.png ocr-select.png shortcut0.png Makefile.in toolbar1.png toolbar.png Makefile.am index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.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
@@ -38142,14 +48810,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka
- @for base in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ @for base in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
++ @for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
done
uninstall-nls:
- for base in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ for base in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
++ for base in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kooka/$$base ;\
done
@@ -38157,7 +48825,7 @@
#>+ 5
distdir-nls:
- for file in kooka_gocr_result.png shortcut1.png kooka_mainctrl.png kooka_gocr.png ocr-select.png toolbar.png index.docbook toolbar1.png toolbar2.png shortcut0.png ; do \
-+ for file in toolbar1.png toolbar2.png shortcut0.png index.docbook kooka_gocr.png kooka_mainctrl.png ocr-select.png shortcut1.png kooka_gocr_result.png toolbar.png ; do \
++ for file in toolbar.png toolbar1.png toolbar2.png kooka_gocr_result.png shortcut0.png shortcut1.png kooka_gocr.png ocr-select.png index.docbook kooka_mainctrl.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -38258,6 +48926,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -599,7 +608,7 @@
+ KDE_DIST=index.docbook configure.png Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook configure.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configure.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
+@@ -626,20 +635,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf
+- @for base in index.docbook configure.png ; do \
++ @for base in configure.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook configure.png ; do \
++ for base in configure.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpdf/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook configure.png ; do \
++ for file in configure.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kpovmodeler/Makefile.in
+++ doc/kpovmodeler/Makefile.in
@@ -115,6 +115,7 @@
@@ -38360,11 +49061,11 @@
#>+ 2
-KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmfinish.png cr22-action-pmrender.png texturepreview.png defaultviewlayout.png tutorial01-plane-tree-translate.png cr22-action-pminterior.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png controlpoints.png tutorial01-light-dialog.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-2.png index.docbook tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png tutorial01-ground-render.png cr22-action-pmsphere.png tutorial01-sphere-dialog.png rendermodesselection.png renderwindow.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in rendersettingsicon.png tutorial01-ground-pigment.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png rendermodequality.png topview.png rendericon.png rendermodeoutput.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
-+KDE_DIST=cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-render-nocolor.png texturepreview.png defaultviewlayout.png tutorial01-plane-tree-translate.png cr22-action-pminterior.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png controlpoints.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-2.png index.docbook cr22-action-pmlight.png tutorial01-light-graphic.png objectpropertiesview.png cameraview.png cr22-action-pmsphere.png tutorial01-ground-render.png tutorial01-sphere-dialog.png renderwindow.png rendermodesselection.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png cr22-action-pmpigment.png objecttree.png cr22-action-pmcolorlist.png cr22-action-pmplane.png Makefile.in tutorial01-ground-pigment.png rendersettingsicon.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png rendermodequality.png topview.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
++KDE_DIST=tutorial01-sphere-render-nocolor.png cr22-action-pmfinish.png cr22-action-pmrender.png texturepreview.png defaultviewlayout.png cr22-action-pminterior.png tutorial01-plane-tree-translate.png tutorial01-ground-color-list.png cr22-action-pmcamera.png tutorial01-sphere-render-solidcolor.png controlpoints.png tutorial01-light-dialog.png dockwidget.png tutorial01-camera-dialog.png rendermodesize.png tutorial01-ground-wrong-colors-render.png index.docbook tutorial01-ground-solid-color-2.png cr22-action-pmsolidcolor.png tutorial01-light-graphic.png cr22-action-pmlight.png objectpropertiesview.png cameraview.png cr22-action-pmsphere.png tutorial01-ground-render.png tutorial01-sphere-dialog.png rendermodesselection.png renderwindow.png tutorial01-camera-graphic.png tutorial01-plane-graphic.png objecttree.png cr22-action-pmpigment.png cr22-action-pmplane.png cr22-action-pmcolorlist.png Makefile.in rendersettingsicon.png tutorial01-ground-pigment.png dockwidgettab.png insertaspopup.png tutorial01-sphere-finish-dialog.png tutorial01-sphere-render-finish.png tutorial01-sphere-solid-color.png tutorial01-plane-tree-expanded.png topview.png rendermodequality.png rendermodeoutput.png rendericon.png tutorial01-plane-dialog.png Makefile.am tutorial01-ground-solid-color-1.png tutorial01-final-render.png rendermodestoolbar.png index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.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
@@ -38373,14 +49074,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler
- @for base in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ @for base in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
++ @for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
done
uninstall-nls:
- for base in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ for base in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
++ for base in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpovmodeler/$$base ;\
done
@@ -38388,7 +49089,7 @@
#>+ 5
distdir-nls:
- for file in index.docbook topview.png tutorial01-light-dialog.png cr22-action-pmrender.png cr22-action-pmfinish.png tutorial01-sphere-finish-dialog.png tutorial01-ground-pigment.png cr22-action-pmsphere.png rendermodeoutput.png cr22-action-pmcamera.png dockwidgettab.png renderwindow.png tutorial01-ground-wrong-colors-render.png tutorial01-final-render.png rendersettingsicon.png cr22-action-pminterior.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png insertaspopup.png rendermodesselection.png defaultviewlayout.png cr22-action-pmpigment.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-render-finish.png tutorial01-plane-tree-expanded.png cr22-action-pmlight.png tutorial01-ground-color-list.png tutorial01-sphere-dialog.png tutorial01-camera-dialog.png cr22-action-pmcolorlist.png tutorial01-plane-tree-translate.png rendermodestoolbar.png rendermodequality.png tutorial01-plane-dialog.png texturepreview.png tutorial01-camera-graphic.png rendericon.png tutorial01-sphere-solid-color.png controlpoints.png cr22-action-pmplane.png tutorial01-ground-render.png objectpropertiesview.png tutorial01-sphere-render-nocolor.png rendermodesize.png cameraview.png dockwidget.png tutorial01-light-graphic.png objecttree.png cr22-action-pmsolidcolor.png ; do \
-+ for file in tutorial01-plane-tree-expanded.png rendersettingsicon.png tutorial01-plane-dialog.png tutorial01-sphere-finish-dialog.png cr22-action-pmcamera.png tutorial01-light-graphic.png topview.png tutorial01-sphere-render-nocolor.png tutorial01-sphere-dialog.png tutorial01-ground-pigment.png tutorial01-final-render.png rendermodestoolbar.png dockwidget.png cr22-action-pminterior.png cr22-action-pmfinish.png rendericon.png cr22-action-pmplane.png tutorial01-sphere-solid-color.png tutorial01-ground-render.png tutorial01-plane-graphic.png tutorial01-sphere-render-solidcolor.png index.docbook dockwidgettab.png tutorial01-camera-dialog.png controlpoints.png cr22-action-pmlight.png defaultviewlayout.png tutorial01-ground-solid-color-1.png tutorial01-ground-color-list.png texturepreview.png insertaspopup.png tutorial01-ground-solid-color-2.png tutorial01-plane-tree-translate.png tutorial01-ground-wrong-colors-render.png rendermodesize.png cr22-action-pmrender.png objecttree.png cr22-action-pmsolidcolor.png tutorial01-sphere-render-finish.png tutorial01-light-dialog.png tutorial01-camera-graphic.png cr22-action-pmcolorlist.png cr22-action-pmsphere.png rendermodequality.png cr22-action-pmpigment.png cameraview.png objectpropertiesview.png rendermodeoutput.png rendermodesselection.png renderwindow.png ; do \
++ for file in tutorial01-plane-graphic.png renderwindow.png rendericon.png cr22-action-pmcamera.png tutorial01-camera-dialog.png dockwidget.png cr22-action-pmsolidcolor.png tutorial01-ground-solid-color-1.png tutorial01-ground-solid-color-2.png tutorial01-sphere-finish-dialog.png rendermodesselection.png tutorial01-sphere-render-finish.png rendermodestoolbar.png rendermodeoutput.png tutorial01-plane-tree-translate.png defaultviewlayout.png tutorial01-plane-dialog.png texturepreview.png tutorial01-sphere-dialog.png tutorial01-ground-wrong-colors-render.png rendermodequality.png cr22-action-pmlight.png tutorial01-sphere-solid-color.png cr22-action-pmpigment.png cr22-action-pminterior.png cr22-action-pmrender.png tutorial01-plane-tree-expanded.png cr22-action-pmcolorlist.png tutorial01-sphere-render-solidcolor.png tutorial01-light-dialog.png cr22-action-pmfinish.png tutorial01-light-graphic.png tutorial01-camera-graphic.png tutorial01-ground-pigment.png objectpropertiesview.png cr22-action-pmplane.png tutorial01-ground-color-list.png tutorial01-ground-render.png cr22-action-pmsphere.png insertaspopup.png index.docbook rendermodesize.png topview.png rendersettingsicon.png tutorial01-final-render.png controlpoints.png tutorial01-sphere-render-nocolor.png dockwidgettab.png objecttree.png cameraview.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -38591,7 +49292,7 @@
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook preview.png window.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) window.png index.docbook preview.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preview.png window.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
@@ -38600,14 +49301,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot
- @for base in index.docbook preview.png window.png ; do \
-+ @for base in window.png index.docbook preview.png ; do \
++ @for base in preview.png window.png index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
done
uninstall-nls:
- for base in index.docbook preview.png window.png ; do \
-+ for base in window.png index.docbook preview.png ; do \
++ for base in preview.png window.png index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksnapshot/$$base ;\
done
@@ -38615,7 +49316,7 @@
#>+ 5
distdir-nls:
- for file in index.docbook preview.png window.png ; do \
-+ for file in window.png index.docbook preview.png ; do \
++ for file in preview.png window.png index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -38716,39 +49417,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +608,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.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
-@@ -626,20 +635,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow
-- @for base in screenshot.png index.docbook ; do \
-+ @for base in index.docbook screenshot.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- done
-
- uninstall-nls:
-- for base in screenshot.png index.docbook ; do \
-+ for base in index.docbook screenshot.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuickshow/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in screenshot.png index.docbook ; do \
-+ for file in index.docbook screenshot.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
--- doc/kview/Makefile.in
+++ doc/kview/Makefile.in
@@ -115,6 +115,7 @@
@@ -38851,7 +49519,7 @@
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kview-application-configuration.png kview-viewer-configuration.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kview-viewer-configuration.png kview-application-configuration.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kview-application-configuration.png kview-viewer-configuration.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
@@ -38860,14 +49528,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview
- @for base in index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ @for base in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; do \
++ @for base in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
done
uninstall-nls:
- for base in index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ for base in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; do \
++ for base in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kview/$$base ;\
done
@@ -38875,7 +49543,7 @@
#>+ 5
distdir-nls:
- for file in index.docbook kview-application-configuration.png kview-viewer-configuration.png ; do \
-+ for file in index.docbook kview-viewer-configuration.png kview-application-configuration.png ; do \
++ for file in kview-application-configuration.png kview-viewer-configuration.png index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -38960,7 +49628,7 @@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
-SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
-+SUBDIRS =. ksnapshot kpdf kpovmodeler kamera kuickshow kview kgamma kghostview kooka kolourpaint kiconedit kruler kcoloredit kdvi
++SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
#>- all: all-recursive
#>+ 1
all: docs-am all-recursive
@@ -39375,41 +50043,44 @@
#>+ 25
install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-- $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
++ $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
+ $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
- $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems
$(INSTALL_DATA) $(srcdir)/cr22-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
- $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+- $(INSTALL_DATA) $(srcdir)/cr22-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems
- $(INSTALL_DATA) $(srcdir)/cr32-filesys-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-camera_test.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++ $(INSTALL_DATA) $(srcdir)/cr16-device-camera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/camera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/camera_test.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/camera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera.png
#>+ 15
force-reedit:
@@ -39510,7 +50181,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -859,18 +868,18 @@
+@@ -860,18 +869,18 @@
.NOEXPORT:
#>+ 3
@@ -39535,7 +50206,7 @@
#>+ 3
kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -944,7 +953,7 @@
+@@ -945,7 +954,7 @@
#>+ 3
clean-metasources:
@@ -39544,29 +50215,9 @@
#>+ 2
KDE_DIST=kcolorchooser.desktop hi32-app-kcoloredit.png kcoloreditui.rc paletteviewscrolledarea.h Makefile.in textselection.cpp kcoloredit.desktop uninstall.desktop hi16-app-kcolorchooser.png Makefile.am hi22-app-kcolorchooser.png hi16-app-kcoloredit.png
-@@ -956,17 +965,17 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcolorchooser.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcoloredit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kcolorchooser.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcolorchooser.png
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kcoloredit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
+@@ -1008,7 +1017,7 @@
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcolorchooser.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcoloredit.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcolorchooser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcoloredit.png
- #>+ 15
- force-reedit:
-@@ -1007,7 +1016,7 @@
-
-
#>+ 11
-kcoloredit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kzcolorselector.cpp $(srcdir)/imageselection.cpp $(srcdir)/texteditselection.cpp $(srcdir)/gradientselection.cpp $(srcdir)/colorselector.cpp $(srcdir)/kxycolorselector.cpp $(srcdir)/paletteview.cpp $(srcdir)/paletteviewscrolledarea.cpp $(srcdir)/editablestreamhistory.cpp $(srcdir)/color.cpp $(srcdir)/palette.cpp $(srcdir)/loadpalettedlg.cpp $(srcdir)/kcoloreditview.cpp $(srcdir)/kcoloreditdoc.cpp $(srcdir)/kcoloredit.cpp $(srcdir)/main.cpp texteditselection.moc paletteview.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
+kcoloredit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kzcolorselector.cpp $(srcdir)/imageselection.cpp $(srcdir)/texteditselection.cpp $(srcdir)/gradientselection.cpp $(srcdir)/colorselector.cpp $(srcdir)/kxycolorselector.cpp $(srcdir)/paletteview.cpp $(srcdir)/paletteviewscrolledarea.cpp $(srcdir)/editablestreamhistory.cpp $(srcdir)/color.cpp $(srcdir)/palette.cpp $(srcdir)/loadpalettedlg.cpp $(srcdir)/kcoloreditview.cpp $(srcdir)/kcoloreditdoc.cpp $(srcdir)/kcoloredit.cpp $(srcdir)/main.cpp paletteview.moc texteditselection.moc kcoloreditdoc.moc loadpalettedlg.moc paletteviewscrolledarea.moc colorselector.moc kxycolorselector.moc kcoloredit.moc gradientselection.moc kcoloreditview.moc kzcolorselector.moc imageselection.moc
@@ -39699,30 +50350,74 @@
#>+ 3
fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1227,6 +1229,13 @@
+@@ -1227,18 +1229,18 @@
mocs: fontprogress.moc
#>+ 3
+-fontpool.moc: $(srcdir)/fontpool.h
+- $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
+infodialog.moc: $(srcdir)/infodialog.h
+ $(MOC) $(srcdir)/infodialog.h -o infodialog.moc
+
+ #>+ 2
+-mocs: fontpool.moc
++mocs: infodialog.moc
+
+ #>+ 3
+-kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
+- $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
++fontpool.moc: $(srcdir)/fontpool.h
++ $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
+
+ #>+ 2
+-mocs: kdvi_multipage.moc
++mocs: fontpool.moc
+
+ #>+ 3
+ optionDialogSpecialWidget.moc: $(srcdir)/optionDialogSpecialWidget.h
+@@ -1248,18 +1250,18 @@
+ mocs: optionDialogSpecialWidget.moc
+
+ #>+ 3
+-renderedDviPagePixmap.moc: $(srcdir)/renderedDviPagePixmap.h
+- $(MOC) $(srcdir)/renderedDviPagePixmap.h -o renderedDviPagePixmap.moc
++kdvi_multipage.moc: $(srcdir)/kdvi_multipage.h
++ $(MOC) $(srcdir)/kdvi_multipage.h -o kdvi_multipage.moc
+
+ #>+ 2
+-mocs: renderedDviPagePixmap.moc
++mocs: kdvi_multipage.moc
+
+ #>+ 3
+-optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
+- $(MOC) $(srcdir)/optionDialogFontsWidget.h -o optionDialogFontsWidget.moc
++renderedDviPagePixmap.moc: $(srcdir)/renderedDviPagePixmap.h
++ $(MOC) $(srcdir)/renderedDviPagePixmap.h -o renderedDviPagePixmap.moc
+
+ #>+ 2
+-mocs: optionDialogFontsWidget.moc
++mocs: renderedDviPagePixmap.moc
+
+ #>+ 3
+ dviRenderer.moc: $(srcdir)/dviRenderer.h
+@@ -1269,11 +1271,18 @@
+ mocs: dviRenderer.moc
+
+ #>+ 3
++optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
++ $(MOC) $(srcdir)/optionDialogFontsWidget.h -o optionDialogFontsWidget.moc
+
+#>+ 2
-+mocs: infodialog.moc
++mocs: optionDialogFontsWidget.moc
+
+#>+ 3
- fontpool.moc: $(srcdir)/fontpool.h
- $(MOC) $(srcdir)/fontpool.h -o fontpool.moc
-
-@@ -1270,10 +1279,10 @@
-
- #>+ 3
clean-metasources:
- -rm -f dviPageCache.moc dviWidget.moc psgs.moc infodialog.moc fontprogress.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc renderedDviPagePixmap.moc optionDialogFontsWidget.moc dviRenderer.moc
-+ -rm -f dviPageCache.moc psgs.moc dviWidget.moc fontprogress.moc infodialog.moc fontpool.moc kdvi_multipage.moc optionDialogSpecialWidget.moc renderedDviPagePixmap.moc optionDialogFontsWidget.moc dviRenderer.moc
++ -rm -f dviPageCache.moc psgs.moc dviWidget.moc fontprogress.moc infodialog.moc fontpool.moc optionDialogSpecialWidget.moc kdvi_multipage.moc renderedDviPagePixmap.moc dviRenderer.moc optionDialogFontsWidget.moc
#>+ 2
-KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h prefs.kcfgc TeXFont_TFM.h TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviPageCache.h dviWidget.h bigEndianByteReader.h prebookmark.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui renderedDviPagePixmap.h kdvimultipage.desktop kdvi.lsm fontEncoding.h glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
-+KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h TeXFont_TFM.h prefs.kcfgc TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviPageCache.h dviWidget.h bigEndianByteReader.h prebookmark.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui renderedDviPagePixmap.h kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop fontpool.h dvisourcesplitter.h Makefile.am kdvi_part.rc
++KDE_DIST=kdvi.kcfg kdvi_multipage.h fontEncodingPool.h psgs.h dviFile.h TeXFont_TFM.h prefs.kcfgc TeXFont_PFB.h TeXFontDefinition.h kdvi.h optionDialogSpecialWidget_base.ui performanceMeasurement.h TeXFont.h dviPageCache.h dviWidget.h bigEndianByteReader.h prebookmark.h TeXFont_PK.h tips fontMap.h optionDialogFontsWidget_base.ui renderedDviPagePixmap.h kdvimultipage.desktop fontEncoding.h kdvi.lsm glyph.h optionDialogFontsWidget.h kprinterwrapper.h psheader.txt infodialog.h configure.in.in fontprogress.h Makefile.in optionDialogSpecialWidget.h kdvi.desktop dvisourcesplitter.h fontpool.h Makefile.am kdvi_part.rc
#>+ 5
clean-ui:
@@ -39827,29 +50522,32 @@
#>+ 19
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kdvi.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- $(INSTALL_DATA) $(srcdir)/hisc-app-kdvi.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/hi48-app-kdvi.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdvi.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdvi.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdvi.png
#>+ 15
force-reedit:
@@ -39954,29 +50652,29 @@
#>+ 19
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/hisc-app-kfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
$(INSTALL_DATA) $(srcdir)/hi22-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfax.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfax.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfax.svgz
#>+ 15
force-reedit:
@@ -40180,30 +50878,27 @@
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfaxview.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kfaxview.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/hisc-app-kfaxview.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kfaxview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfaxview.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfaxview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kfaxview.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfaxview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfaxview.png
#>+ 15
force-reedit:
@@ -42147,6 +52842,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -926,22 +935,22 @@
+ mocs: displaynumber.moc
+
+ #>+ 3
+-gammactrl.moc: $(srcdir)/gammactrl.h
+- $(MOC) $(srcdir)/gammactrl.h -o gammactrl.moc
++kgamma.moc: $(srcdir)/kgamma.h
++ $(MOC) $(srcdir)/kgamma.h -o kgamma.moc
+
+ #>+ 2
+-mocs: gammactrl.moc
++mocs: kgamma.moc
+
+ #>+ 3
+-kgamma.moc: $(srcdir)/kgamma.h
+- $(MOC) $(srcdir)/kgamma.h -o kgamma.moc
++gammactrl.moc: $(srcdir)/gammactrl.h
++ $(MOC) $(srcdir)/gammactrl.h -o gammactrl.moc
+
+ #>+ 2
+-mocs: kgamma.moc
++mocs: gammactrl.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f displaynumber.moc gammactrl.moc kgamma.moc
++ -rm -f displaynumber.moc kgamma.moc gammactrl.moc
+
+ #>+ 2
+ KDE_DIST=gammactrl.h xf86configpath.h kgamma.h kgamma.desktop displaynumber.h Makefile.in xvidextwrap.h Makefile.am
--- kgamma/kcmkgamma/pics/Makefile.in
+++ kgamma/kcmkgamma/pics/Makefile.in
@@ -125,6 +125,7 @@
@@ -42244,34 +52969,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -627,23 +636,23 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=rgbscale.png hi48-app-kgamma.png greyscale.png cmyscale.png background.png hi16-app-kgamma.png midgrey.png Makefile.in lightgrey.png darkgrey.png hi32-app-kgamma.png Makefile.am
-+KDE_DIST=rgbscale.png hi48-app-kgamma.png greyscale.png background.png cmyscale.png hi16-app-kgamma.png midgrey.png Makefile.in lightgrey.png darkgrey.png hi32-app-kgamma.png Makefile.am
-
- #>+ 2
- docs-am:
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kgamma.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgamma.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgamma.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
-
- #>+ 15
--- kgamma/Makefile.in
+++ kgamma/Makefile.in
@@ -132,6 +132,7 @@
@@ -42708,33 +53405,33 @@
#>+ 22
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/hi64-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
$(INSTALL_DATA) $(srcdir)/hi22-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
$(INSTALL_DATA) $(srcdir)/hi16-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- $(INSTALL_DATA) $(srcdir)/hi128-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/hi64-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kghostview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kghostview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kghostview.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kghostview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kghostview.png
@@ -42846,42 +53543,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -951,11 +960,11 @@
- mocs: knew.moc
+@@ -972,18 +981,18 @@
+ mocs: kicon.moc
#>+ 3
--kicongrid.moc: $(srcdir)/kicongrid.h
-- $(MOC) $(srcdir)/kicongrid.h -o kicongrid.moc
-+kicon.moc: $(srcdir)/kicon.h
-+ $(MOC) $(srcdir)/kicon.h -o kicon.moc
+-kiconconfig.moc: $(srcdir)/kiconconfig.h
+- $(MOC) $(srcdir)/kiconconfig.h -o kiconconfig.moc
++kcolorgrid.moc: $(srcdir)/kcolorgrid.h
++ $(MOC) $(srcdir)/kcolorgrid.h -o kcolorgrid.moc
#>+ 2
--mocs: kicongrid.moc
-+mocs: kicon.moc
+-mocs: kiconconfig.moc
++mocs: kcolorgrid.moc
#>+ 3
- kiconedit.moc: $(srcdir)/kiconedit.h
-@@ -965,11 +974,11 @@
- mocs: kiconedit.moc
+-kcolorgrid.moc: $(srcdir)/kcolorgrid.h
+- $(MOC) $(srcdir)/kcolorgrid.h -o kcolorgrid.moc
++kiconconfig.moc: $(srcdir)/kiconconfig.h
++ $(MOC) $(srcdir)/kiconconfig.h -o kiconconfig.moc
+ #>+ 2
+-mocs: kcolorgrid.moc
++mocs: kiconconfig.moc
+
#>+ 3
--kicon.moc: $(srcdir)/kicon.h
-- $(MOC) $(srcdir)/kicon.h -o kicon.moc
-+kicongrid.moc: $(srcdir)/kicongrid.h
-+ $(MOC) $(srcdir)/kicongrid.h -o kicongrid.moc
+ kiconcolors.moc: $(srcdir)/kiconcolors.h
+@@ -993,22 +1002,22 @@
+ mocs: kiconcolors.moc
+ #>+ 3
+-kresize.moc: $(srcdir)/kresize.h
+- $(MOC) $(srcdir)/kresize.h -o kresize.moc
++palettetoolbar.moc: $(srcdir)/palettetoolbar.h
++ $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
+
#>+ 2
--mocs: kicon.moc
-+mocs: kicongrid.moc
+-mocs: kresize.moc
++mocs: palettetoolbar.moc
#>+ 3
- kiconconfig.moc: $(srcdir)/kiconconfig.h
-@@ -1008,7 +1017,7 @@
+-palettetoolbar.moc: $(srcdir)/palettetoolbar.h
+- $(MOC) $(srcdir)/palettetoolbar.h -o palettetoolbar.moc
++kresize.moc: $(srcdir)/kresize.h
++ $(MOC) $(srcdir)/kresize.h -o kresize.moc
+ #>+ 2
+-mocs: palettetoolbar.moc
++mocs: kresize.moc
+
#>+ 3
clean-metasources:
- -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+ -rm -f knew.moc kicon.moc kiconedit.moc kicongrid.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
++ -rm -f knew.moc kicongrid.moc kiconedit.moc kicon.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
#>+ 2
KDE_DIST=kiconedit.h kiconeditui.rc kiconedit.desktop kicon.h kcolorgrid.h kiconconfig.h properties.h utils.h Makefile.in kresize.h palettetoolbar.h version.h knew.h Makefile.am kicongrid.h kiconcolors.h
@@ -42890,7 +53603,7 @@
#>+ 11
-kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
-+kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicongrid.moc kiconedit.moc kicon.moc kiconconfig.moc kcolorgrid.moc kiconcolors.moc kresize.moc palettetoolbar.moc
++kiconedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/utils.cpp $(srcdir)/main.cpp $(srcdir)/kiconedit.cpp $(srcdir)/kicongrid.cpp $(srcdir)/kiconcolors.cpp $(srcdir)/kcolorgrid.cpp $(srcdir)/palettetoolbar.cpp $(srcdir)/kicon.cpp $(srcdir)/kresize.cpp $(srcdir)/knew.cpp $(srcdir)/properties.cpp $(srcdir)/kiconeditslots.cpp $(srcdir)/kiconconfig.cpp knew.moc kicon.moc kiconedit.moc kicongrid.moc kcolorgrid.moc kiconconfig.moc kiconcolors.moc palettetoolbar.moc kresize.moc
@echo 'creating kiconedit.all_cpp.cpp ...'; \
rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
@@ -43098,33 +53811,27 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -765,20 +774,20 @@
-
- #>+ 16
+@@ -767,17 +776,17 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/hi22-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kiconedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kiconedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kiconedit.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kiconedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kiconedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kiconedit.png
#>+ 15
- force-reedit:
--- kiconedit/pics/toolbar/Makefile.in
+++ kiconedit/pics/toolbar/Makefile.in
@@ -125,6 +125,7 @@
@@ -43227,7 +53934,7 @@
#>+ 2
-KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-+KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
++KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
#>+ 2
docs-am:
@@ -43522,98 +54229,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1146,46 +1155,46 @@
- mrmlsearch_DEPENDENCIES = libkdeinit_mrmlsearch.la
+@@ -1167,18 +1176,18 @@
+ mocs: browser.moc
#>+ 3
--mrml_part.moc: $(srcdir)/mrml_part.h
-- $(MOC) $(srcdir)/mrml_part.h -o mrml_part.moc
-+browser.moc: $(srcdir)/browser.h
-+ $(MOC) $(srcdir)/browser.h -o browser.moc
-
- #>+ 2
--mocs: mrml_part.moc
-+mocs: browser.moc
-
- #>+ 3
--collectioncombo.moc: $(srcdir)/collectioncombo.h
-- $(MOC) $(srcdir)/collectioncombo.h -o collectioncombo.moc
-+algorithmdialog.moc: $(srcdir)/algorithmdialog.h
-+ $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
-
- #>+ 2
--mocs: collectioncombo.moc
-+mocs: algorithmdialog.moc
-
- #>+ 3
--browser.moc: $(srcdir)/browser.h
-- $(MOC) $(srcdir)/browser.h -o browser.moc
-+algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-+ $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
-
- #>+ 2
--mocs: browser.moc
-+mocs: algorithmcombo.moc
-
- #>+ 3
-algorithmdialog.moc: $(srcdir)/algorithmdialog.h
- $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
-+mrml_part.moc: $(srcdir)/mrml_part.h
-+ $(MOC) $(srcdir)/mrml_part.h -o mrml_part.moc
++loader.moc: $(srcdir)/loader.h
++ $(MOC) $(srcdir)/loader.h -o loader.moc
#>+ 2
-mocs: algorithmdialog.moc
-+mocs: mrml_part.moc
++mocs: loader.moc
#>+ 3
-loader.moc: $(srcdir)/loader.h
- $(MOC) $(srcdir)/loader.h -o loader.moc
-+collectioncombo.moc: $(srcdir)/collectioncombo.h
-+ $(MOC) $(srcdir)/collectioncombo.h -o collectioncombo.moc
++algorithmdialog.moc: $(srcdir)/algorithmdialog.h
++ $(MOC) $(srcdir)/algorithmdialog.h -o algorithmdialog.moc
#>+ 2
-mocs: loader.moc
-+mocs: collectioncombo.moc
++mocs: algorithmdialog.moc
#>+ 3
--algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-- $(MOC) $(srcdir)/algorithmcombo.h -o algorithmcombo.moc
-+loader.moc: $(srcdir)/loader.h
-+ $(MOC) $(srcdir)/loader.h -o loader.moc
-
- #>+ 2
--mocs: algorithmcombo.moc
-+mocs: loader.moc
-
- #>+ 3
- mrml_view.moc: $(srcdir)/mrml_view.h
+ algorithmcombo.moc: $(srcdir)/algorithmcombo.h
@@ -1221,7 +1230,7 @@
#>+ 3
clean-metasources:
- -rm -f mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc algorithmcombo.moc mrml_view.moc propertywidgets.moc
-+ -rm -f browser.moc algorithmdialog.moc algorithmcombo.moc mrml_part.moc collectioncombo.moc loader.moc mrml_view.moc propertywidgets.moc
++ -rm -f mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc algorithmcombo.moc mrml_view.moc propertywidgets.moc
#>+ 2
KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_part.desktop mrml_view.h algorithmdialog.h mrml_elements.h propertysheet.h collectioncombo.h mrml.h Makefile.in algorithmcombo.h mrml.desktop loader.h propertywidgets.cpp mrml_part.h Makefile.am
-@@ -1316,8 +1325,8 @@
- #>+ 26
- collectioncombo.lo: collectioncombo.moc
- propertywidgets.o: propertywidgets.moc
--algorithmdialog.o: algorithmdialog.moc
- collectioncombo.o: collectioncombo.moc
-+algorithmdialog.o: algorithmdialog.moc
- mrmlsearch$(EXEEXT): $(mrmlsearch_OBJECTS) $(mrmlsearch_DEPENDENCIES)
- @rm -f mrmlsearch$(EXEEXT)
- $(CXXLINK) $(mrmlsearch_LDFLAGS) $(mrmlsearch_OBJECTS) $(mrmlsearch_LDADD) $(LIBS)
-@@ -1336,6 +1345,6 @@
- nmcheck-am: nmcheck
- propertywidgets.lo: propertywidgets.moc
- browser.lo: browser.moc
--browser.o: browser.moc
- algorithmcombo.o: algorithmcombo.moc
-+browser.o: browser.moc
- mrml_part.lo: mrml_part.moc
+@@ -1272,7 +1281,7 @@
+
+
+ #>+ 11
+-libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc loader.moc algorithmdialog.moc mrml_view.moc algorithmcombo.moc
++libkmrmlpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mrml_part.cpp $(srcdir)/mrml_view.cpp $(srcdir)/loader.cpp $(srcdir)/mrml_elements.cpp $(srcdir)/mrml_creator.cpp $(srcdir)/browser.cpp $(srcdir)/algorithmdialog.cpp $(srcdir)/collectioncombo.cpp $(srcdir)/algorithmcombo.cpp $(srcdir)/propertysheet.cpp mrml_part.moc collectioncombo.moc browser.moc algorithmdialog.moc loader.moc mrml_view.moc algorithmcombo.moc
+ @echo 'creating libkmrmlpart_la.all_cpp.cpp ...'; \
+ rm -f libkmrmlpart_la.all_cpp.files libkmrmlpart_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
--- kmrml/kmrml/server/Makefile.in
+++ kmrml/kmrml/server/Makefile.in
@@ -162,6 +162,7 @@
@@ -44002,71 +54660,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1041,18 +1050,18 @@
- mocs: kptool.moc
-
- #>+ 3
--kpthumbnail.moc: $(srcdir)/kpthumbnail.h
-- $(MOC) $(srcdir)/kpthumbnail.h -o kpthumbnail.moc
-+kpmainwindow.moc: $(srcdir)/kpmainwindow.h
-+ $(MOC) $(srcdir)/kpmainwindow.h -o kpmainwindow.moc
-
- #>+ 2
--mocs: kpthumbnail.moc
-+mocs: kpmainwindow.moc
-
- #>+ 3
--kpmainwindow.moc: $(srcdir)/kpmainwindow.h
-- $(MOC) $(srcdir)/kpmainwindow.h -o kpmainwindow.moc
-+kpthumbnail.moc: $(srcdir)/kpthumbnail.h
-+ $(MOC) $(srcdir)/kpthumbnail.h -o kpthumbnail.moc
-
- #>+ 2
--mocs: kpmainwindow.moc
-+mocs: kpthumbnail.moc
-
- #>+ 3
- kpviewmanager.moc: $(srcdir)/kpviewmanager.h
-@@ -1090,11 +1099,11 @@
+@@ -1090,13 +1099,6 @@
mocs: kpdocument.moc
#>+ 3
-kpview.moc: $(srcdir)/kpview.h
- $(MOC) $(srcdir)/kpview.h -o kpview.moc
-+kpselection.moc: $(srcdir)/kpselection.h
-+ $(MOC) $(srcdir)/kpselection.h -o kpselection.moc
-
- #>+ 2
+-
+-#>+ 2
-mocs: kpview.moc
-+mocs: kpselection.moc
-
- #>+ 3
+-
+-#>+ 3
kpcommandhistory.moc: $(srcdir)/kpcommandhistory.h
-@@ -1104,11 +1113,11 @@
- mocs: kpcommandhistory.moc
+ $(MOC) $(srcdir)/kpcommandhistory.h -o kpcommandhistory.moc
+@@ -1111,6 +1113,13 @@
+ mocs: kpselection.moc
+
#>+ 3
--kpselection.moc: $(srcdir)/kpselection.h
-- $(MOC) $(srcdir)/kpselection.h -o kpselection.moc
+kpview.moc: $(srcdir)/kpview.h
+ $(MOC) $(srcdir)/kpview.h -o kpview.moc
-
- #>+ 2
--mocs: kpselection.moc
++
++#>+ 2
+mocs: kpview.moc
++
++#>+ 3
+ kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
+ $(MOC) $(srcdir)/kpsinglekeytriggersaction.h -o kpsinglekeytriggersaction.moc
- #>+ 3
- kpsinglekeytriggersaction.moc: $(srcdir)/kpsinglekeytriggersaction.h
@@ -1119,10 +1128,10 @@
#>+ 3
clean-metasources:
- -rm -f kptool.moc kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpcommandhistory.moc kpselection.moc kpsinglekeytriggersaction.moc
-+ -rm -f kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpselection.moc kpcommandhistory.moc kpview.moc kpsinglekeytriggersaction.moc
++ -rm -f kptool.moc kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpcommandhistory.moc kpselection.moc kpview.moc kpsinglekeytriggersaction.moc
#>+ 2
-KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpviewscrollablecontainer.h kpselectiontransparency.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kptool.h kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
-+KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpmainwindow.h kpsinglekeytriggersaction.h kolourpaint.desktop kptool.h kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
++KDE_DIST=kpdefs.h kptextstyle.h kpcolor.h kpthumbnail.h kpselectiontransparency.h kpviewscrollablecontainer.h kpviewmanager.h kpdocumentsaveoptions.h kpdocumentmetainfo.h kpsinglekeytriggersaction.h kpmainwindow.h kolourpaint.desktop kptool.h kpdocument.h kpselectiondrag.h kpview.h kpcommandhistory.h kpmainwindow_p.h kptemppixmap.h kpwidgetmapper.h Makefile.in BUGS kpselection.h kolourpaintui.rc kpdocumentsaveoptionswidget.h Makefile.am VERSION
#>+ 2
docs-am:
@@ -44075,7 +54706,7 @@
#>+ 11
-kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h kolourpaintversion.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kptool.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpselection.moc kpcommandhistory.moc kpview.moc kpsinglekeytriggersaction.moc
-+kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h kolourpaintversion.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kptool.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kptool.moc kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpcommandhistory.moc kpselection.moc kpsinglekeytriggersaction.moc
++kolourpaint.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kolourpaint.cpp kolourpaintlicense.h kolourpaintversion.h $(srcdir)/kpdocument.cpp $(srcdir)/kpdocumentmetainfo.cpp $(srcdir)/kpdocumentsaveoptions.cpp $(srcdir)/kpdocumentsaveoptionswidget.cpp $(srcdir)/kpview.cpp $(srcdir)/kpcolor.cpp $(srcdir)/kpcommandhistory.cpp $(srcdir)/kpmainwindow.cpp $(srcdir)/kpmainwindow_edit.cpp $(srcdir)/kpmainwindow_help.cpp $(srcdir)/kpmainwindow_image.cpp $(srcdir)/kpmainwindow_tools.cpp $(srcdir)/kpmainwindow_file.cpp $(srcdir)/kpmainwindow_settings.cpp $(srcdir)/kpmainwindow_statusbar.cpp $(srcdir)/kpmainwindow_text.cpp $(srcdir)/kpmainwindow_view.cpp $(srcdir)/kpselection.cpp $(srcdir)/kpselectiondrag.cpp $(srcdir)/kpselectiontransparency.cpp $(srcdir)/kpsinglekeytriggersaction.cpp $(srcdir)/kptemppixmap.cpp $(srcdir)/kptextstyle.cpp $(srcdir)/kpthumbnail.cpp $(srcdir)/kptool.cpp $(srcdir)/kpviewmanager.cpp $(srcdir)/kpviewscrollablecontainer.cpp $(srcdir)/kpwidgetmapper.cpp kptool.moc kpmainwindow.moc kpthumbnail.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpview.moc kpselection.moc kpcommandhistory.moc kpsinglekeytriggersaction.moc
@echo 'creating kolourpaint.all_cpp.cpp ...'; \
rm -f kolourpaint.all_cpp.files kolourpaint.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kolourpaint.all_cpp.final; \
@@ -44278,38 +54909,32 @@
#>+ 2
-KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png cr32-action-tool_rectangle.png cr32-action-tool_line.png hi32-app-kolourpaint.png cr16-action-tool_flood_fill.png crsc-action-tool_elliptical_selection.svgz cr48-action-tool_color_washer.png crsc-action-tool_spraycan.svgz crsc-action-tool_text.svgz crsc-action-tool_eraser.svgz cr48-action-tool_line.png cr32-action-tool_rounded_rectangle.png cr16-action-tool_curve.png cr32-action-tool_brush.png cr32-action-tool_free_form_selection.png crsc-action-tool_free_form_selection.svgz crsc-action-tool_flood_fill.svgz cr16-action-tool_line.png crsc-action-tool_polygon.svgz cr48-action-tool_curve.png cr16-action-tool_polyline.png cr22-action-tool_color_picker.png cr22-action-tool_elliptical_selection.png cr22-action-tool_text.png cr48-action-tool_polyline.png cr22-action-tool_line.png cr32-action-tool_spraycan.png cr22-action-tool_spraycan.png hi22-app-kolourpaint.png crsc-action-tool_brush.svgz cr22-action-tool_pen.png cr22-action-tool_brush.png cr22-action-tool_ellipse.png cr16-action-tool_rect_selection.png crsc-action-tool_color_picker.svgz cr16-action-tool_polygon.png cr16-action-tool_color_washer.png cr48-action-tool_polygon.png crsc-action-tool_ellipse.svgz cr32-action-tool_rect_selection.png cr48-action-tool_ellipse.png cr16-action-tool_free_form_selection.png cr32-action-tool_flood_fill.png crsc-action-tool_pen.svgz cr32-action-tool_eraser.png cr32-action-tool_text.png cr22-action-tool_free_form_selection.png cr16-action-tool_color_picker.png cr48-action-tool_brush.png cr48-action-tool_spraycan.png crsc-action-tool_line.svgz cr48-action-tool_flood_fill.png cr16-action-tool_ellipse.png cr22-action-tool_rectangle.png cr32-action-tool_elliptical_selection.png cr22-action-tool_eraser.png cr22-action-tool_polyline.png cr16-action-tool_elliptical_selection.png cr16-action-tool_text.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png hi16-app-kolourpaint.png crsc-action-tool_color_washer.svgz cr32-action-tool_pen.png cr48-action-tool_color_picker.png cr22-action-tool_flood_fill.png crsc-action-tool_rectangle.svgz cr48-action-tool_free_form_selection.png cr16-action-tool_spraycan.png Makefile.in cr22-action-tool_color_washer.png cr48-action-tool_pen.png cr22-action-tool_rounded_rectangle.png crsc-action-tool_curve.svgz cr48-action-tool_rounded_rectangle.png cr16-action-tool_pen.png crsc-action-tool_polyline.svgz cr16-action-tool_rounded_rectangle.png cr48-action-tool_rectangle.png cr48-action-tool_elliptical_selection.png cr32-action-tool_polyline.png cr32-action-tool_ellipse.png cr32-action-tool_color_washer.png hisc-app-kolourpaint.svgz cr32-action-tool_polygon.png cr16-action-tool_eraser.png cr32-action-tool_color_picker.png cr22-action-tool_rect_selection.png cr16-action-tool_rectangle.png cr48-action-tool_rect_selection.png crsc-action-tool_rounded_rectangle.svgz cr32-action-tool_curve.png Makefile.am cr16-action-tool_brush.png crsc-action-tool_rect_selection.svgz
-+KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png cr32-action-tool_rectangle.png hi32-app-kolourpaint.png cr32-action-tool_line.png cr16-action-tool_flood_fill.png crsc-action-tool_elliptical_selection.svgz cr48-action-tool_color_washer.png crsc-action-tool_spraycan.svgz crsc-action-tool_text.svgz crsc-action-tool_eraser.svgz cr32-action-tool_rounded_rectangle.png cr48-action-tool_line.png cr16-action-tool_curve.png cr32-action-tool_brush.png cr32-action-tool_free_form_selection.png crsc-action-tool_free_form_selection.svgz crsc-action-tool_flood_fill.svgz cr16-action-tool_line.png crsc-action-tool_polygon.svgz cr48-action-tool_curve.png cr22-action-tool_color_picker.png cr16-action-tool_polyline.png cr22-action-tool_elliptical_selection.png cr22-action-tool_text.png cr48-action-tool_polyline.png cr22-action-tool_line.png cr32-action-tool_spraycan.png cr22-action-tool_spraycan.png hi22-app-kolourpaint.png crsc-action-tool_brush.svgz cr22-action-tool_pen.png cr22-action-tool_brush.png cr22-action-tool_ellipse.png cr16-action-tool_rect_selection.png crsc-action-tool_color_picker.svgz cr16-action-tool_polygon.png cr16-action-tool_color_washer.png cr48-action-tool_polygon.png crsc-action-tool_ellipse.svgz cr32-action-tool_rect_selection.png cr48-action-tool_ellipse.png cr16-action-tool_free_form_selection.png cr32-action-tool_flood_fill.png crsc-action-tool_pen.svgz cr32-action-tool_eraser.png cr32-action-tool_text.png cr22-action-tool_free_form_selection.png cr16-action-tool_color_picker.png cr48-action-tool_brush.png cr48-action-tool_spraycan.png crsc-action-tool_line.svgz cr48-action-tool_flood_fill.png cr16-action-tool_ellipse.png cr22-action-tool_rectangle.png cr22-action-tool_eraser.png cr32-action-tool_elliptical_selection.png cr22-action-tool_polyline.png cr16-action-tool_text.png cr16-action-tool_elliptical_selection.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png crsc-action-tool_color_washer.svgz hi16-app-kolourpaint.png cr48-action-tool_color_picker.png cr32-action-tool_pen.png cr22-action-tool_flood_fill.png crsc-action-tool_rectangle.svgz cr48-action-tool_free_form_selection.png cr16-action-tool_spraycan.png Makefile.in cr22-action-tool_color_washer.png cr48-action-tool_pen.png crsc-action-tool_curve.svgz cr22-action-tool_rounded_rectangle.png cr48-action-tool_rounded_rectangle.png crsc-action-tool_polyline.svgz cr16-action-tool_pen.png cr16-action-tool_rounded_rectangle.png cr48-action-tool_rectangle.png cr32-action-tool_polyline.png cr48-action-tool_elliptical_selection.png cr32-action-tool_ellipse.png cr32-action-tool_color_washer.png hisc-app-kolourpaint.svgz cr32-action-tool_polygon.png cr16-action-tool_eraser.png cr32-action-tool_color_picker.png cr22-action-tool_rect_selection.png cr16-action-tool_rectangle.png cr48-action-tool_rect_selection.png crsc-action-tool_rounded_rectangle.svgz cr32-action-tool_curve.png Makefile.am cr16-action-tool_brush.png crsc-action-tool_rect_selection.svgz
++KDE_DIST=cr22-action-tool_curve.png hi48-app-kolourpaint.png hi32-app-kolourpaint.png cr32-action-tool_line.png cr32-action-tool_rectangle.png cr16-action-tool_flood_fill.png crsc-action-tool_elliptical_selection.svgz cr48-action-tool_color_washer.png crsc-action-tool_spraycan.svgz crsc-action-tool_text.svgz cr48-action-tool_line.png crsc-action-tool_eraser.svgz cr32-action-tool_rounded_rectangle.png cr32-action-tool_brush.png cr16-action-tool_curve.png cr32-action-tool_free_form_selection.png crsc-action-tool_flood_fill.svgz crsc-action-tool_free_form_selection.svgz cr16-action-tool_line.png crsc-action-tool_polygon.svgz cr48-action-tool_curve.png cr22-action-tool_elliptical_selection.png cr16-action-tool_polyline.png cr22-action-tool_color_picker.png cr48-action-tool_polyline.png cr22-action-tool_text.png cr22-action-tool_line.png cr32-action-tool_spraycan.png cr22-action-tool_spraycan.png hi22-app-kolourpaint.png crsc-action-tool_brush.svgz cr22-action-tool_pen.png cr22-action-tool_brush.png cr22-action-tool_ellipse.png cr16-action-tool_rect_selection.png crsc-action-tool_color_picker.svgz cr16-action-tool_polygon.png cr16-action-tool_color_washer.png cr48-action-tool_polygon.png cr32-action-tool_rect_selection.png crsc-action-tool_ellipse.svgz cr48-action-tool_ellipse.png cr16-action-tool_free_form_selection.png cr32-action-tool_flood_fill.png crsc-action-tool_pen.svgz cr32-action-tool_text.png cr32-action-tool_eraser.png cr22-action-tool_free_form_selection.png cr16-action-tool_color_picker.png cr48-action-tool_brush.png cr48-action-tool_spraycan.png crsc-action-tool_line.svgz cr48-action-tool_flood_fill.png cr16-action-tool_ellipse.png cr32-action-tool_elliptical_selection.png cr22-action-tool_rectangle.png cr22-action-tool_polyline.png cr22-action-tool_eraser.png cr16-action-tool_elliptical_selection.png cr16-action-tool_text.png cr22-action-tool_polygon.png cr48-action-tool_eraser.png cr48-action-tool_text.png hi16-app-kolourpaint.png crsc-action-tool_color_washer.svgz cr32-action-tool_pen.png cr48-action-tool_color_picker.png cr22-action-tool_flood_fill.png crsc-action-tool_rectangle.svgz cr48-action-tool_free_form_selection.png cr16-action-tool_spraycan.png cr22-action-tool_color_washer.png Makefile.in crsc-action-tool_curve.svgz cr48-action-tool_pen.png cr22-action-tool_rounded_rectangle.png cr48-action-tool_rounded_rectangle.png cr16-action-tool_pen.png crsc-action-tool_polyline.svgz cr48-action-tool_rectangle.png cr16-action-tool_rounded_rectangle.png cr48-action-tool_elliptical_selection.png cr32-action-tool_polyline.png cr32-action-tool_ellipse.png cr32-action-tool_color_washer.png cr32-action-tool_polygon.png hisc-app-kolourpaint.svgz cr16-action-tool_eraser.png cr32-action-tool_color_picker.png cr22-action-tool_rect_selection.png cr16-action-tool_rectangle.png cr48-action-tool_rect_selection.png crsc-action-tool_rounded_rectangle.svgz cr32-action-tool_curve.png Makefile.am cr16-action-tool_brush.png crsc-action-tool_rect_selection.svgz
#>+ 2
docs-am:
#>+ 219
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
$(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
@@ -44322,20 +54947,35 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
$(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_ellipse.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_curve.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_washer.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polygon.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polygon.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
@@ -44344,14 +54984,11 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
@@ -44361,144 +54998,142 @@
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_washer.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_curve.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rect_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rect_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_brush.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
$(INSTALL_DATA) $(srcdir)/crsc-action-tool_spraycan.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_spraycan.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_eraser.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_eraser.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_elliptical_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_free_form_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
$(INSTALL_DATA) $(srcdir)/cr48-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_free_form_selection.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_pen.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rect_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
-+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polygon.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_ellipse.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_ellipse.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_flood_fill.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_line.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_free_form_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_washer.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_brush.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_elliptical_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_free_form_selection.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rect_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rectangle.png
- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/scalable/apps
- $(INSTALL_DATA) $(srcdir)/hisc-app-kolourpaint.svgz $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-action-tool_pen.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_eraser.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_color_picker.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_flood_fill.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_line.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_polyline.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_rounded_rectangle.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_pen.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
- $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
-- $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polyline.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_text.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_color_picker.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
+ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_curve.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_free_form_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rounded_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_brush.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_color_washer.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_eraser.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
++ $(mkinstalldirs) $(DESTDIR)$(actionicondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kolourpaint.png $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_spraycan.png $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_rectangle.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_ellipse.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_pen.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-tool_polygon.png $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_curve.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tool_flood_fill.png $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-tool_text.svgz $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-tool_elliptical_selection.png $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kolourpaint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kolourpaint.svgz
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
@@ -44511,20 +55146,27 @@
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
@@ -44533,14 +55175,11 @@
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rectangle.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_curve.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
@@ -44549,124 +55188,125 @@
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_washer.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_flood_fill.png
-rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_spraycan.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rect_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_brush.png
-rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_free_form_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_pen.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_flood_fill.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_line.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/22x22/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_text.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rect_selection.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_eraser.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polyline.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polyline.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_eraser.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_curve.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_text.png
-+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polygon.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_ellipse.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_line.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_picker.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
+- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polygon.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_brush.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_line.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_washer.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_polyline.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_spraycan.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rectangle.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rectangle.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_brush.svgz
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
-+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rect_selection.png
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_free_form_selection.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rect_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_picker.png
-rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_rectangle.png
- -rm -f $(DESTDIR)$(actionicondir)/hicolor/scalable/apps/kolourpaint.svgz
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_eraser.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_color_picker.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_flood_fill.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_line.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_polyline.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/32x32/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_pen.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_pen.svgz
- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
-- -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
-- -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polyline.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_text.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_free_form_selection.png
+ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_color_picker.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_curve.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_elliptical_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_spraycan.png
+ -rm -f $(DESTDIR)$(actionicondir)/hicolor/16x16/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_curve.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_free_form_selection.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rounded_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_brush.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_color_washer.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_eraser.png
++ -rm -f $(DESTDIR)$(actionicondir)/hicolor/48x48/apps/kolourpaint.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/22x22/actions/tool_spraycan.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_rectangle.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_ellipse.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_pen.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/48x48/actions/tool_polygon.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_curve.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/16x16/actions/tool_flood_fill.png
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/scalable/actions/tool_text.svgz
++ -rm -f $(DESTDIR)$(actionicondir)/crystalsvg/32x32/actions/tool_elliptical_selection.png
#>+ 15
force-reedit:
@@ -44767,10 +55407,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -754,6 +763,13 @@
+@@ -754,6 +763,20 @@
mocs: kpeffectflatten.moc
#>+ 3
++kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
++ $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
++
++#>+ 2
++mocs: kpeffectsdialog.moc
++
++#>+ 3
+kpeffectbalance.moc: $(srcdir)/kpeffectbalance.h
+ $(MOC) $(srcdir)/kpeffectbalance.h -o kpeffectbalance.moc
+
@@ -44781,20 +55428,6 @@
kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
-@@ -761,6 +777,13 @@
- mocs: kpeffectinvert.moc
-
- #>+ 3
-+kpeffectsdialog.moc: $(srcdir)/kpeffectsdialog.h
-+ $(MOC) $(srcdir)/kpeffectsdialog.h -o kpeffectsdialog.moc
-+
-+#>+ 2
-+mocs: kpeffectsdialog.moc
-+
-+#>+ 3
- kpeffectblursharpen.moc: $(srcdir)/kpeffectblursharpen.h
- $(MOC) $(srcdir)/kpeffectblursharpen.h -o kpeffectblursharpen.moc
-
@@ -775,36 +798,22 @@
mocs: kpeffectemboss.moc
@@ -44835,7 +55468,7 @@
#>+ 3
clean-metasources:
- -rm -f kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectsdialog.moc kpeffectbalance.moc kpcoloreffect.moc
-+ -rm -f kpeffectflatten.moc kpeffectbalance.moc kpeffectinvert.moc kpeffectsdialog.moc kpeffectblursharpen.moc kpeffectemboss.moc kpcoloreffect.moc kpeffectreducecolors.moc
++ -rm -f kpeffectflatten.moc kpeffectsdialog.moc kpeffectbalance.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpcoloreffect.moc kpeffectreducecolors.moc
#>+ 2
KDE_DIST=kpeffectsdialog.h kpeffectemboss.h kpeffectbalance.h kpfloodfill.h kpeffectblursharpen.h kpeffectinvert.h kpeffectreducecolors.h kppixmapfx.h kpeffectflatten.h Makefile.in kpcoloreffect.h Makefile.am
@@ -44844,7 +55477,7 @@
#>+ 11
-libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectblursharpen.moc kpeffectemboss.moc kpeffectreducecolors.moc kpeffectsdialog.moc kpeffectbalance.moc kpcoloreffect.moc
-+libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectsdialog.moc kpeffectinvert.moc kpeffectbalance.moc kpeffectblursharpen.moc kpcoloreffect.moc kpeffectemboss.moc kpeffectreducecolors.moc
++libkolourpaintpixmapfx_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpcoloreffect.cpp $(srcdir)/kpeffectbalance.cpp $(srcdir)/kpeffectblursharpen.cpp $(srcdir)/kpeffectemboss.cpp $(srcdir)/kpeffectflatten.cpp $(srcdir)/kpeffectinvert.cpp $(srcdir)/kpeffectreducecolors.cpp $(srcdir)/kpeffectsdialog.cpp $(srcdir)/kpfloodfill.cpp $(srcdir)/kppixmapfx.cpp kpeffectflatten.moc kpeffectinvert.moc kpeffectbalance.moc kpeffectsdialog.moc kpeffectblursharpen.moc kpcoloreffect.moc kpeffectemboss.moc kpeffectreducecolors.moc
@echo 'creating libkolourpaintpixmapfx_la.all_cpp.cpp ...'; \
rm -f libkolourpaintpixmapfx_la.all_cpp.files libkolourpaintpixmapfx_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintpixmapfx_la.all_cpp.final; \
@@ -44969,7 +55602,7 @@
#>+ 2
-KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolautocrop.h kptoolcurve.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
-+KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolrectangle.h kptoolflip.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolrectselection.h kptoolskew.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
++KDE_DIST=kptoolresizescale.h kptoolrotate.h kptoolpolyline.h kptoolcrop.h kptoolellipse.h kptoolairspray.h kptoolfloodfill.h kptoolellipticalselection.h kptooleraser.h kptoolflip.h kptoolrectangle.h kptoolselection.h kptoolpolygon.h kptoolcurve.h kptoolautocrop.h kptooltext.h kptoolconverttograyscale.h kptoolfreeformselection.h kptoolskew.h kptoolrectselection.h kptoolclear.h kptoolroundedrectangle.h Makefile.in kptoolaction.h kptoolcolorwasher.h kptoolbrush.h kptoolline.h kptoolpreviewdialog.h kptoolcolorpicker.h Makefile.am kptoolpen.h
#>+ 2
docs-am:
@@ -45070,42 +55703,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -732,11 +741,11 @@
+@@ -732,18 +741,18 @@
.NOEXPORT:
#>+ 3
-kpunzoomedthumbnailview.moc: $(srcdir)/kpunzoomedthumbnailview.h
- $(MOC) $(srcdir)/kpunzoomedthumbnailview.h -o kpunzoomedthumbnailview.moc
-+kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-+ $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
++kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
++ $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
#>+ 2
-mocs: kpunzoomedthumbnailview.moc
-+mocs: kpzoomedthumbnailview.moc
++mocs: kpthumbnailview.moc
#>+ 3
- kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
-@@ -746,11 +755,11 @@
- mocs: kpthumbnailview.moc
-
- #>+ 3
--kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-- $(MOC) $(srcdir)/kpzoomedthumbnailview.h -o kpzoomedthumbnailview.moc
+-kpthumbnailview.moc: $(srcdir)/kpthumbnailview.h
+- $(MOC) $(srcdir)/kpthumbnailview.h -o kpthumbnailview.moc
+kpunzoomedthumbnailview.moc: $(srcdir)/kpunzoomedthumbnailview.h
+ $(MOC) $(srcdir)/kpunzoomedthumbnailview.h -o kpunzoomedthumbnailview.moc
#>+ 2
--mocs: kpzoomedthumbnailview.moc
+-mocs: kpthumbnailview.moc
+mocs: kpunzoomedthumbnailview.moc
#>+ 3
- kpzoomedview.moc: $(srcdir)/kpzoomedview.h
+ kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
@@ -761,7 +770,7 @@
#>+ 3
clean-metasources:
- -rm -f kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
-+ -rm -f kpzoomedthumbnailview.moc kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedview.moc
++ -rm -f kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
#>+ 2
KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h
@@ -45114,7 +55742,7 @@
#>+ 11
-libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpzoomedthumbnailview.moc kpthumbnailview.moc kpunzoomedthumbnailview.moc kpzoomedview.moc
-+libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedthumbnailview.moc kpzoomedview.moc
++libkolourpaintviews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpthumbnailview.cpp $(srcdir)/kpunzoomedthumbnailview.cpp $(srcdir)/kpzoomedthumbnailview.cpp $(srcdir)/kpzoomedview.cpp kpzoomedthumbnailview.moc kpunzoomedthumbnailview.moc kpthumbnailview.moc kpzoomedview.moc
@echo 'creating libkolourpaintviews_la.all_cpp.cpp ...'; \
rm -f libkolourpaintviews_la.all_cpp.files libkolourpaintviews_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkolourpaintviews_la.all_cpp.final; \
@@ -45250,7 +55878,7 @@
#>+ 3
kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -842,7 +851,7 @@
+@@ -842,10 +851,10 @@
#>+ 3
clean-metasources:
@@ -45258,7 +55886,11 @@
+ -rm -f kptoolwidgetbrush.moc kpcolortoolbar.moc kptooltoolbar.moc kptoolwidgetopaqueortransparent.moc kptoolwidgetspraycansize.moc kpresizesignallinglabel.moc kpcolorsimilaritydialog.moc kptoolwidgetlinewidth.moc kptoolwidgetfillstyle.moc kptoolwidgeterasersize.moc kptoolwidgetbase.moc kpsqueezedtextlabel.moc
#>+ 2
- KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetopaqueortransparent.h kptoolwidgetspraycansize.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
+-KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetopaqueortransparent.h kptoolwidgetspraycansize.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
++KDE_DIST=kpcolorsimilaritycube.h kptoolwidgetbase.h kptoolwidgetfillstyle.h kptooltoolbar.h kptoolwidgeterasersize.h kptoolwidgetspraycansize.h kptoolwidgetopaqueortransparent.h kpresizesignallinglabel.h kpcolortoolbar.h Makefile.in kptoolwidgetlinewidth.h kpsqueezedtextlabel.h kpcolorsimilaritydialog.h kptoolwidgetbrush.h Makefile.am
+
+ #>+ 2
+ docs-am:
@@ -889,7 +898,7 @@
@@ -45375,81 +56007,148 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1019,13 +1028,6 @@
- mocs: imgprintdialog.moc
+@@ -1005,81 +1014,67 @@
+ .NOEXPORT:
#>+ 3
--ksaneocr.moc: $(srcdir)/ksaneocr.h
-- $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
+-img_saver.moc: $(srcdir)/img_saver.h
+- $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
-
-#>+ 2
--mocs: ksaneocr.moc
+-mocs: img_saver.moc
-
-#>+ 3
- kocrkadmos.moc: $(srcdir)/kocrkadmos.h
- $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
+-imgprintdialog.moc: $(srcdir)/imgprintdialog.h
+- $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
+-
+-#>+ 2
+-mocs: imgprintdialog.moc
+-
+-#>+ 3
+-ksaneocr.moc: $(srcdir)/ksaneocr.h
+- $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
++ocrresedit.moc: $(srcdir)/ocrresedit.h
++ $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
-@@ -1040,6 +1042,13 @@
- mocs: dwmenuaction.moc
+ #>+ 2
+-mocs: ksaneocr.moc
++mocs: ocrresedit.moc
#>+ 3
-+ksaneocr.moc: $(srcdir)/ksaneocr.h
-+ $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
-+
-+#>+ 2
-+mocs: ksaneocr.moc
-+
-+#>+ 3
- thumbview.moc: $(srcdir)/thumbview.h
- $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
+-kocrkadmos.moc: $(srcdir)/kocrkadmos.h
+- $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
++imgnamecombo.moc: $(srcdir)/imgnamecombo.h
++ $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
-@@ -1082,18 +1091,18 @@
- mocs: kadmosocr.moc
+ #>+ 2
+-mocs: kocrkadmos.moc
++mocs: imgnamecombo.moc
#>+ 3
--imageselectline.moc: $(srcdir)/imageselectline.h
-- $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
-+kocrgocr.moc: $(srcdir)/kocrgocr.h
-+ $(MOC) $(srcdir)/kocrgocr.h -o kocrgocr.moc
+-dwmenuaction.moc: $(srcdir)/dwmenuaction.h
+- $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
++kookapref.moc: $(srcdir)/kookapref.h
++ $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
#>+ 2
--mocs: imageselectline.moc
-+mocs: kocrgocr.moc
+-mocs: dwmenuaction.moc
++mocs: kookapref.moc
#>+ 3
--kocrgocr.moc: $(srcdir)/kocrgocr.h
-- $(MOC) $(srcdir)/kocrgocr.h -o kocrgocr.moc
-+imageselectline.moc: $(srcdir)/imageselectline.h
-+ $(MOC) $(srcdir)/imageselectline.h -o imageselectline.moc
+-thumbview.moc: $(srcdir)/thumbview.h
+- $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
++img_saver.moc: $(srcdir)/img_saver.h
++ $(MOC) $(srcdir)/img_saver.h -o img_saver.moc
#>+ 2
--mocs: kocrgocr.moc
-+mocs: imageselectline.moc
+-mocs: thumbview.moc
++mocs: img_saver.moc
#>+ 3
- scanpackager.moc: $(srcdir)/scanpackager.h
-@@ -1103,18 +1112,18 @@
+-kocrocrad.moc: $(srcdir)/kocrocrad.h
+- $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
++imgprintdialog.moc: $(srcdir)/imgprintdialog.h
++ $(MOC) $(srcdir)/imgprintdialog.h -o imgprintdialog.moc
+
+ #>+ 2
+-mocs: kocrocrad.moc
++mocs: imgprintdialog.moc
+
+ #>+ 3
+-ocrresedit.moc: $(srcdir)/ocrresedit.h
+- $(MOC) $(srcdir)/ocrresedit.h -o ocrresedit.moc
++kadmosocr.moc: $(srcdir)/kadmosocr.h
++ $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
+
+ #>+ 2
+-mocs: ocrresedit.moc
++mocs: kadmosocr.moc
+
+ #>+ 3
+-imgnamecombo.moc: $(srcdir)/imgnamecombo.h
+- $(MOC) $(srcdir)/imgnamecombo.h -o imgnamecombo.moc
++kocrkadmos.moc: $(srcdir)/kocrkadmos.h
++ $(MOC) $(srcdir)/kocrkadmos.h -o kocrkadmos.moc
+
+ #>+ 2
+-mocs: imgnamecombo.moc
++mocs: kocrkadmos.moc
+
+ #>+ 3
+-kookapref.moc: $(srcdir)/kookapref.h
+- $(MOC) $(srcdir)/kookapref.h -o kookapref.moc
++dwmenuaction.moc: $(srcdir)/dwmenuaction.h
++ $(MOC) $(srcdir)/dwmenuaction.h -o dwmenuaction.moc
+
+ #>+ 2
+-mocs: kookapref.moc
++mocs: dwmenuaction.moc
+
+ #>+ 3
+-kadmosocr.moc: $(srcdir)/kadmosocr.h
+- $(MOC) $(srcdir)/kadmosocr.h -o kadmosocr.moc
++ksaneocr.moc: $(srcdir)/ksaneocr.h
++ $(MOC) $(srcdir)/ksaneocr.h -o ksaneocr.moc
+
+ #>+ 2
+-mocs: kadmosocr.moc
++mocs: ksaneocr.moc
+
+ #>+ 3
+ imageselectline.moc: $(srcdir)/imageselectline.h
+@@ -1103,6 +1098,20 @@
mocs: scanpackager.moc
#>+ 3
--kookaview.moc: $(srcdir)/kookaview.h
-- $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
+kookaprint.moc: $(srcdir)/kookaprint.h
+ $(MOC) $(srcdir)/kookaprint.h -o kookaprint.moc
-
- #>+ 2
--mocs: kookaview.moc
++
++#>+ 2
+mocs: kookaprint.moc
++
++#>+ 3
++thumbview.moc: $(srcdir)/thumbview.h
++ $(MOC) $(srcdir)/thumbview.h -o thumbview.moc
++
++#>+ 2
++mocs: thumbview.moc
++
++#>+ 3
+ kookaview.moc: $(srcdir)/kookaview.h
+ $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
+@@ -1110,11 +1119,11 @@
+ mocs: kookaview.moc
+
#>+ 3
-kookaprint.moc: $(srcdir)/kookaprint.h
- $(MOC) $(srcdir)/kookaprint.h -o kookaprint.moc
-+kookaview.moc: $(srcdir)/kookaview.h
-+ $(MOC) $(srcdir)/kookaview.h -o kookaview.moc
++kocrocrad.moc: $(srcdir)/kocrocrad.h
++ $(MOC) $(srcdir)/kocrocrad.h -o kocrocrad.moc
#>+ 2
-mocs: kookaprint.moc
-+mocs: kookaview.moc
++mocs: kocrocrad.moc
#>+ 3
kooka.moc: $(srcdir)/kooka.h
@@ -45458,7 +56157,7 @@
#>+ 3
clean-metasources:
- -rm -f img_saver.moc imgprintdialog.moc ksaneocr.moc kocrkadmos.moc dwmenuaction.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaview.moc kookaprint.moc kooka.moc kocrbase.moc
-+ -rm -f img_saver.moc imgprintdialog.moc kocrkadmos.moc dwmenuaction.moc ksaneocr.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
++ -rm -f ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc kocrkadmos.moc dwmenuaction.moc ksaneocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaprint.moc thumbview.moc kookaview.moc kocrocrad.moc kooka.moc kocrbase.moc
#>+ 2
KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am
@@ -45467,20 +56166,28 @@
#>+ 11
-kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp img_saver.moc imgprintdialog.moc dwmenuaction.moc kocrkadmos.moc ksaneocr.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc imageselectline.moc kocrgocr.moc scanpackager.moc kookaview.moc kookaprint.moc kooka.moc kocrbase.moc
-+kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp img_saver.moc imgprintdialog.moc ksaneocr.moc dwmenuaction.moc kocrkadmos.moc thumbview.moc kocrocrad.moc ocrresedit.moc imgnamecombo.moc kookapref.moc kadmosocr.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaprint.moc kookaview.moc kooka.moc kocrbase.moc
++kooka.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kooka.cpp $(srcdir)/kookaview.cpp $(srcdir)/kookapref.cpp $(srcdir)/img_saver.cpp $(srcdir)/ksaneocr.cpp $(srcdir)/kookaimage.cpp $(srcdir)/kookaimagemeta.cpp $(srcdir)/scanpackager.cpp $(srcdir)/imgnamecombo.cpp $(srcdir)/imageselectline.cpp $(srcdir)/thumbview.cpp $(srcdir)/thumbviewitem.cpp $(srcdir)/dwmenuaction.cpp $(srcdir)/kocrbase.cpp $(srcdir)/kocrgocr.cpp $(srcdir)/kocrkadmos.cpp $(srcdir)/kadmosocr.cpp $(srcdir)/ocrword.cpp $(srcdir)/ocrresedit.cpp $(srcdir)/kookaprint.cpp $(srcdir)/imgprintdialog.cpp $(srcdir)/kocrocrad.cpp ocrresedit.moc imgnamecombo.moc kookapref.moc img_saver.moc imgprintdialog.moc kadmosocr.moc ksaneocr.moc dwmenuaction.moc kocrkadmos.moc kocrgocr.moc imageselectline.moc scanpackager.moc kookaview.moc thumbview.moc kookaprint.moc kocrocrad.moc kooka.moc kocrbase.moc
@echo 'creating kooka.all_cpp.cpp ...'; \
rm -f kooka.all_cpp.files kooka.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kooka.all_cpp.final; \
-@@ -1221,8 +1230,8 @@
+@@ -1220,14 +1229,14 @@
+ kocrbase.lo: kocrbase.moc
imgnamecombo.o: imgnamecombo.moc
img_saver.o: img_saver.moc
- kadmosocr.lo: kadmosocr.moc
+-kadmosocr.lo: kadmosocr.moc
-kocrkadmos.o: kocrkadmos.moc
ksaneocr.lo: ksaneocr.moc
+kocrkadmos.o: kocrkadmos.moc
++kadmosocr.lo: kadmosocr.moc
kookaview.o: kookaview.moc
kooka.lo: kooka.moc
kookaprint.o: kookaprint.moc
+-kookaview.lo: kookaview.moc
+ kocrocrad.o: kocrocrad.moc
++kookaview.lo: kookaview.moc
+ kookapref.lo: kookapref.moc
+ nmcheck-am: nmcheck
+ imgprintdialog.lo: imgprintdialog.moc
--- kooka/pics/Makefile.in
+++ kooka/pics/Makefile.in
@@ -125,6 +125,7 @@
@@ -46087,39 +56794,42 @@
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/hi64-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- $(INSTALL_DATA) $(srcdir)/hi128-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
$(INSTALL_DATA) $(srcdir)/hisc-app-kpdf.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kpdf.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/hi64-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpdf.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kpdf.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpdf.png
#>+ 15
force-reedit:
@@ -46850,7 +57560,7 @@
#>+ 2
-KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h SecurityHandler.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h UGString.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
-+KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h SecurityHandler.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h FontEncodingTables.h UnicodeMapTables.h UGString.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc Parser.h JArithmeticDecoder.h GfxFont.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
++KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h SecurityHandler.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h UGString.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
#>+ 2
docs-am:
@@ -47921,31 +58631,31 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1780,18 +1789,18 @@
- mocs: pmblobcylinderedit.moc
+@@ -1794,18 +1803,18 @@
+ mocs: pmcylinderedit.moc
#>+ 3
--pmlineedits.moc: $(srcdir)/pmlineedits.h
-- $(MOC) $(srcdir)/pmlineedits.h -o pmlineedits.moc
-+pmcylinderedit.moc: $(srcdir)/pmcylinderedit.h
-+ $(MOC) $(srcdir)/pmcylinderedit.h -o pmcylinderedit.moc
+-pmtorusedit.moc: $(srcdir)/pmtorusedit.h
+- $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
++pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
++ $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
#>+ 2
--mocs: pmlineedits.moc
-+mocs: pmcylinderedit.moc
+-mocs: pmtorusedit.moc
++mocs: pminteriortextureedit.moc
#>+ 3
--pmcylinderedit.moc: $(srcdir)/pmcylinderedit.h
-- $(MOC) $(srcdir)/pmcylinderedit.h -o pmcylinderedit.moc
-+pmlineedits.moc: $(srcdir)/pmlineedits.h
-+ $(MOC) $(srcdir)/pmlineedits.h -o pmlineedits.moc
+-pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
+- $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
++pmtorusedit.moc: $(srcdir)/pmtorusedit.h
++ $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
#>+ 2
--mocs: pmcylinderedit.moc
-+mocs: pmlineedits.moc
+-mocs: pminteriortextureedit.moc
++mocs: pmtorusedit.moc
#>+ 3
- pmtorusedit.moc: $(srcdir)/pmtorusedit.h
+ pmblobedit.moc: $(srcdir)/pmblobedit.h
@@ -1843,18 +1852,18 @@
mocs: pmobjectselect.moc
@@ -47971,84 +58681,124 @@
#>+ 3
pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1913,13 +1922,6 @@
- mocs: pmimagemapedit.moc
+@@ -1864,18 +1873,18 @@
+ mocs: pmcameraedit.moc
#>+ 3
+-pmboxedit.moc: $(srcdir)/pmboxedit.h
+- $(MOC) $(srcdir)/pmboxedit.h -o pmboxedit.moc
++pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
++ $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
+
+ #>+ 2
+-mocs: pmboxedit.moc
++mocs: pmblobsphereedit.moc
+
+ #>+ 3
+-pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
+- $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
++pmboxedit.moc: $(srcdir)/pmboxedit.h
++ $(MOC) $(srcdir)/pmboxedit.h -o pmboxedit.moc
+
+ #>+ 2
+-mocs: pmblobsphereedit.moc
++mocs: pmboxedit.moc
+
+ #>+ 3
+ pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
+@@ -1899,25 +1908,25 @@
+ mocs: pmdockwidget_private.moc
+
+ #>+ 3
+-pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
+- $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
++pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
++ $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
+
+ #>+ 2
+-mocs: pmlibraryiconview.moc
++mocs: pmimagemapedit.moc
+
+ #>+ 3
+-pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
+- $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
++pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
++ $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
+
+ #>+ 2
+-mocs: pmimagemapedit.moc
++mocs: pmlibraryiconview.moc
+
+ #>+ 3
-pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
- $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
--
--#>+ 2
++pmdragwidget.moc: $(srcdir)/pmdragwidget.h
++ $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
+
+ #>+ 2
-mocs: pmradiosityedit.moc
--
--#>+ 3
++mocs: pmdragwidget.moc
+
+ #>+ 3
pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
- $(MOC) $(srcdir)/pmlightgroupedit.h -o pmlightgroupedit.moc
+@@ -1927,11 +1936,11 @@
+ mocs: pmlightgroupedit.moc
-@@ -1934,18 +1936,18 @@
- mocs: pmdragwidget.moc
-
#>+ 3
--pmactions.moc: $(srcdir)/pmactions.h
-- $(MOC) $(srcdir)/pmactions.h -o pmactions.moc
+-pmdragwidget.moc: $(srcdir)/pmdragwidget.h
+- $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
+pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
+ $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
#>+ 2
--mocs: pmactions.moc
+-mocs: pmdragwidget.moc
+mocs: pmradiosityedit.moc
#>+ 3
--pmdiscedit.moc: $(srcdir)/pmdiscedit.h
-- $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
-+pmactions.moc: $(srcdir)/pmactions.h
-+ $(MOC) $(srcdir)/pmactions.h -o pmactions.moc
-
- #>+ 2
--mocs: pmdiscedit.moc
-+mocs: pmactions.moc
-
- #>+ 3
- pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
-@@ -1955,6 +1957,13 @@
+ pmactions.moc: $(srcdir)/pmactions.h
+@@ -1955,13 +1964,6 @@
mocs: pmlibrarybrowser.moc
#>+ 3
-+pmdiscedit.moc: $(srcdir)/pmdiscedit.h
-+ $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
-+
-+#>+ 2
-+mocs: pmdiscedit.moc
-+
-+#>+ 3
- pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
+-pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
+- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
+-
+-#>+ 2
+-mocs: pmpalettevalueedit.moc
+-
+-#>+ 3
+ pmlightedit.moc: $(srcdir)/pmlightedit.h
+ $(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
-@@ -1969,18 +1978,18 @@
+@@ -1969,11 +1971,11 @@
mocs: pmlightedit.moc
#>+ 3
-pmview.moc: $(srcdir)/pmview.h
- $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-+ $(MOC) $(srcdir)/pmobjectlibrarysettings.h -o pmobjectlibrarysettings.moc
++pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
++ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
#>+ 2
-mocs: pmview.moc
-+mocs: pmobjectlibrarysettings.moc
++mocs: pmpalettevalueedit.moc
#>+ 3
--pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-- $(MOC) $(srcdir)/pmobjectlibrarysettings.h -o pmobjectlibrarysettings.moc
+ pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
+@@ -1983,6 +1985,13 @@
+ mocs: pmobjectlibrarysettings.moc
+
+ #>+ 3
+pmview.moc: $(srcdir)/pmview.h
+ $(MOC) $(srcdir)/pmview.h -o pmview.moc
-
- #>+ 2
--mocs: pmobjectlibrarysettings.moc
++
++#>+ 2
+mocs: pmview.moc
++
++#>+ 3
+ pmfactory.moc: $(srcdir)/pmfactory.h
+ $(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
- #>+ 3
- pmfactory.moc: $(srcdir)/pmfactory.h
@@ -2011,18 +2020,18 @@
mocs: pmlatheedit.moc
@@ -48074,261 +58824,190 @@
#>+ 3
pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2123,11 +2132,11 @@
- mocs: pmplaneedit.moc
+@@ -2060,18 +2069,18 @@
+ mocs: pmdialogeditbase.moc
#>+ 3
--pmpigmentedit.moc: $(srcdir)/pmpigmentedit.h
-- $(MOC) $(srcdir)/pmpigmentedit.h -o pmpigmentedit.moc
-+pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-+ $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
+-pmfiledialog.moc: $(srcdir)/pmfiledialog.h
+- $(MOC) $(srcdir)/pmfiledialog.h -o pmfiledialog.moc
++pmslopeedit.moc: $(srcdir)/pmslopeedit.h
++ $(MOC) $(srcdir)/pmslopeedit.h -o pmslopeedit.moc
#>+ 2
--mocs: pmpigmentedit.moc
-+mocs: pmglobalphotonsedit.moc
+-mocs: pmfiledialog.moc
++mocs: pmslopeedit.moc
#>+ 3
- pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
-@@ -2137,11 +2146,11 @@
- mocs: pmglobalsettingsedit.moc
+-pmslopeedit.moc: $(srcdir)/pmslopeedit.h
+- $(MOC) $(srcdir)/pmslopeedit.h -o pmslopeedit.moc
++pmfiledialog.moc: $(srcdir)/pmfiledialog.h
++ $(MOC) $(srcdir)/pmfiledialog.h -o pmfiledialog.moc
- #>+ 3
--pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-- $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
-+pmpigmentedit.moc: $(srcdir)/pmpigmentedit.h
-+ $(MOC) $(srcdir)/pmpigmentedit.h -o pmpigmentedit.moc
-
#>+ 2
--mocs: pmglobalphotonsedit.moc
-+mocs: pmpigmentedit.moc
+-mocs: pmslopeedit.moc
++mocs: pmfiledialog.moc
#>+ 3
- pmerrordialog.moc: $(srcdir)/pmerrordialog.h
-@@ -2186,13 +2195,6 @@
- mocs: pmconeedit.moc
-
- #>+ 3
--pmpatternedit.moc: $(srcdir)/pmpatternedit.h
-- $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
--
--#>+ 2
--mocs: pmpatternedit.moc
--
--#>+ 3
- pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
- $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
-
-@@ -2200,18 +2202,18 @@
+ pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
+@@ -2200,6 +2209,13 @@
mocs: pmphotonsedit.moc
#>+ 3
--pmsoredit.moc: $(srcdir)/pmsoredit.h
-- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-+pmpatternedit.moc: $(srcdir)/pmpatternedit.h
-+ $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
-
- #>+ 2
--mocs: pmsoredit.moc
-+mocs: pmpatternedit.moc
-
- #>+ 3
--pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
-- $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
+pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
+ $(MOC) $(srcdir)/pmrainbowedit.h -o pmrainbowedit.moc
-
- #>+ 2
--mocs: pmquickcoloredit.moc
++
++#>+ 2
+mocs: pmrainbowedit.moc
++
++#>+ 3
+ pmsoredit.moc: $(srcdir)/pmsoredit.h
+ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
- #>+ 3
- pmdeclareedit.moc: $(srcdir)/pmdeclareedit.h
-@@ -2221,18 +2223,18 @@
+@@ -2221,11 +2237,11 @@
mocs: pmdeclareedit.moc
#>+ 3
-pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
- $(MOC) $(srcdir)/pmrainbowedit.h -o pmrainbowedit.moc
-+pmsoredit.moc: $(srcdir)/pmsoredit.h
-+ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
++pmdialogview.moc: $(srcdir)/pmdialogview.h
++ $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
#>+ 2
-mocs: pmrainbowedit.moc
-+mocs: pmsoredit.moc
++mocs: pmdialogview.moc
#>+ 3
--pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-- $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
-+pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
-+ $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
+ pmsqeedit.moc: $(srcdir)/pmsqeedit.h
+@@ -2235,25 +2251,25 @@
+ mocs: pmsqeedit.moc
+ #>+ 3
+-pmdialogview.moc: $(srcdir)/pmdialogview.h
+- $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
++pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
++ $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
+
#>+ 2
--mocs: pmsqeedit.moc
-+mocs: pmquickcoloredit.moc
+-mocs: pmdialogview.moc
++mocs: pmbicubicpatchedit.moc
#>+ 3
- pmdialogview.moc: $(srcdir)/pmdialogview.h
-@@ -2242,18 +2244,18 @@
- mocs: pmdialogview.moc
-
- #>+ 3
-pmcoloredit.moc: $(srcdir)/pmcoloredit.h
- $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
-+pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-+ $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
++pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
++ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
#>+ 2
-mocs: pmcoloredit.moc
-+mocs: pmsqeedit.moc
++mocs: pmobjectlinkedit.moc
#>+ 3
-pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
- $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
-+pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-+ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
++pmcoloredit.moc: $(srcdir)/pmcoloredit.h
++ $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
#>+ 2
-mocs: pmbicubicpatchedit.moc
-+mocs: pmobjectlinkedit.moc
++mocs: pmcoloredit.moc
#>+ 3
pmglview.moc: $(srcdir)/pmglview.h
-@@ -2263,11 +2265,18 @@
+@@ -2263,13 +2279,6 @@
mocs: pmglview.moc
#>+ 3
-pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
- $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
-+pmcoloredit.moc: $(srcdir)/pmcoloredit.h
-+ $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
-
- #>+ 2
+-
+-#>+ 2
-mocs: pmobjectlinkedit.moc
-+mocs: pmcoloredit.moc
-+
-+#>+ 3
-+pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
-+ $(MOC) $(srcdir)/pmbicubicpatchedit.h -o pmbicubicpatchedit.moc
-+
-+#>+ 2
-+mocs: pmbicubicpatchedit.moc
-
- #>+ 3
+-
+-#>+ 3
pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
-@@ -2340,18 +2349,18 @@
- mocs: pmnormaledit.moc
+ $(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
+@@ -2382,18 +2391,18 @@
+ mocs: pmpovrayrenderwidget.moc
+
#>+ 3
--pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-- $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
-+pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-+ $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
+-pmdockwidget.moc: $(srcdir)/pmdockwidget.h
+- $(MOC) $(srcdir)/pmdockwidget.h -o pmdockwidget.moc
++pmviewbase.moc: $(srcdir)/pmviewbase.h
++ $(MOC) $(srcdir)/pmviewbase.h -o pmviewbase.moc
#>+ 2
--mocs: pmlibraryobjectsearch.moc
-+mocs: pmgraphicalobjectedit.moc
+-mocs: pmdockwidget.moc
++mocs: pmviewbase.moc
#>+ 3
--pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-- $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
-+pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-+ $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
+-pmviewbase.moc: $(srcdir)/pmviewbase.h
+- $(MOC) $(srcdir)/pmviewbase.h -o pmviewbase.moc
++pmdockwidget.moc: $(srcdir)/pmdockwidget.h
++ $(MOC) $(srcdir)/pmdockwidget.h -o pmdockwidget.moc
#>+ 2
--mocs: pmgraphicalobjectedit.moc
-+mocs: pmlibraryobjectsearch.moc
+-mocs: pmviewbase.moc
++mocs: pmdockwidget.moc
#>+ 3
- pmprismedit.moc: $(srcdir)/pmprismedit.h
-@@ -2396,18 +2405,18 @@
- mocs: pmviewbase.moc
+ pmgridsettings.moc: $(srcdir)/pmgridsettings.h
+@@ -2417,18 +2426,18 @@
+ mocs: pmrendermanager.moc
#>+ 3
--pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-- $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
-+pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-+ $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
+-pmpart.moc: $(srcdir)/pmpart.h
+- $(MOC) $(srcdir)/pmpart.h -o pmpart.moc
++pmsolidcoloredit.moc: $(srcdir)/pmsolidcoloredit.h
++ $(MOC) $(srcdir)/pmsolidcoloredit.h -o pmsolidcoloredit.moc
#>+ 2
--mocs: pmgridsettings.moc
-+mocs: pmdetailobjectedit.moc
+-mocs: pmpart.moc
++mocs: pmsolidcoloredit.moc
#>+ 3
--pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-- $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
-+pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-+ $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
+-pmsolidcoloredit.moc: $(srcdir)/pmsolidcoloredit.h
+- $(MOC) $(srcdir)/pmsolidcoloredit.h -o pmsolidcoloredit.moc
++pmpart.moc: $(srcdir)/pmpart.h
++ $(MOC) $(srcdir)/pmpart.h -o pmpart.moc
#>+ 2
--mocs: pmdetailobjectedit.moc
-+mocs: pmgridsettings.moc
+-mocs: pmsolidcoloredit.moc
++mocs: pmpart.moc
#>+ 3
- pmrendermanager.moc: $(srcdir)/pmrendermanager.h
-@@ -2445,11 +2454,11 @@
- mocs: pmmaterialmapedit.moc
+ pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
+@@ -2452,18 +2461,18 @@
+ mocs: pmvectoredit.moc
#>+ 3
--pmvectoredit.moc: $(srcdir)/pmvectoredit.h
-- $(MOC) $(srcdir)/pmvectoredit.h -o pmvectoredit.moc
+-pmtextureedit.moc: $(srcdir)/pmtextureedit.h
+- $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
+pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
+ $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
#>+ 2
--mocs: pmvectoredit.moc
+-mocs: pmtextureedit.moc
+mocs: pmpovraywidget.moc
#>+ 3
- pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-@@ -2459,11 +2468,11 @@
- mocs: pmtextureedit.moc
-
- #>+ 3
-pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
- $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-+pmvectoredit.moc: $(srcdir)/pmvectoredit.h
-+ $(MOC) $(srcdir)/pmvectoredit.h -o pmvectoredit.moc
++pmtextureedit.moc: $(srcdir)/pmtextureedit.h
++ $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
#>+ 2
-mocs: pmpovraywidget.moc
-+mocs: pmvectoredit.moc
++mocs: pmtextureedit.moc
#>+ 3
pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2494,13 +2503,6 @@
- mocs: pmvectorlistedit.moc
-
- #>+ 3
--pmsolidobjectedit.moc: $(srcdir)/pmsolidobjectedit.h
-- $(MOC) $(srcdir)/pmsolidobjectedit.h -o pmsolidobjectedit.moc
--
--#>+ 2
--mocs: pmsolidobjectedit.moc
--
--#>+ 3
- pmfogedit.moc: $(srcdir)/pmfogedit.h
- $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
-
-@@ -2515,6 +2517,13 @@
- mocs: pmshell.moc
-
- #>+ 3
-+pmsolidobjectedit.moc: $(srcdir)/pmsolidobjectedit.h
-+ $(MOC) $(srcdir)/pmsolidobjectedit.h -o pmsolidobjectedit.moc
-+
-+#>+ 2
-+mocs: pmsolidobjectedit.moc
-+
-+#>+ 3
- pmsettingsdialog.moc: $(srcdir)/pmsettingsdialog.h
- $(MOC) $(srcdir)/pmsettingsdialog.h -o pmsettingsdialog.moc
-
@@ -2581,7 +2590,7 @@
#>+ 3
clean-metasources:
- -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmlibraryentrypreview.moc pmviewlayoutmanager.moc pmcameraedit.moc pmboxedit.moc pmblobsphereedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmradiosityedit.moc pmlightgroupedit.moc pmdragwidget.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmpalettevalueedit.moc pmlightedit.moc pmview.moc pmobjectlibrarysettings.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pminterioredit.moc pmlibraryhandleedit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmfiledialog.moc pmslopeedit.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmrainbowedit.moc pmsqeedit.moc pmdialogview.moc pmcoloredit.moc pmbicubicpatchedit.moc pmglview.moc pmobjectlinkedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmdockwidget.moc pmviewbase.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmpart.moc pmsolidcoloredit.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmtextureedit.moc pmpovraywidget.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
-+ -rm -f pmblobcylinderedit.moc pmcylinderedit.moc pmlineedits.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmboxedit.moc pmblobsphereedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmlightgroupedit.moc pmdragwidget.moc pmradiosityedit.moc pmactions.moc pmlibrarybrowser.moc pmdiscedit.moc pmpalettevalueedit.moc pmlightedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmfiledialog.moc pmslopeedit.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmglobalphotonsedit.moc pmglobalsettingsedit.moc pmpigmentedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmphotonsedit.moc pmpatternedit.moc pmrainbowedit.moc pmdeclareedit.moc pmsoredit.moc pmquickcoloredit.moc pmdialogview.moc pmsqeedit.moc pmobjectlinkedit.moc pmglview.moc pmcoloredit.moc pmbicubicpatchedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmgraphicalobjectedit.moc pmlibraryobjectsearch.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmdockwidget.moc pmviewbase.moc pmdetailobjectedit.moc pmgridsettings.moc pmrendermanager.moc pmpart.moc pmsolidcoloredit.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmpovraywidget.moc pmtextureedit.moc pmvectoredit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmfogedit.moc pmshell.moc pmsolidobjectedit.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
++ -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pminteriortextureedit.moc pmtorusedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmblobsphereedit.moc pmboxedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmimagemapedit.moc pmlibraryiconview.moc pmdragwidget.moc pmlightgroupedit.moc pmradiosityedit.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmlightedit.moc pmpalettevalueedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmrainbowedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmdialogview.moc pmsqeedit.moc pmbicubicpatchedit.moc pmobjectlinkedit.moc pmcoloredit.moc pmglview.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmpovraywidget.moc pmtextureedit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
#>+ 2
KDE_DIST=hi32-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h hi22-app-kpovmodeler.png hi16-app-kpovmodeler.png questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h Makefile.in povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png hi48-app-kpovmodeler.png kpovmodelerui.rc cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc pminsertrules.dtd
@@ -48340,40 +59019,37 @@
- $(INSTALL_DATA) $(srcdir)/hi22-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
-- $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpovmodeler.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpovmodeler.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpovmodeler.png
#>+ 15
force-reedit:
@@ -48474,20 +59150,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -594,473 +603,473 @@
+@@ -594,7 +603,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr16-action-pmcolorlist.png cr22-action-pmblobsphere.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr16-action-pmsqe.png cr22-action-pmslope.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr22-action-pmmaterialmap.png cr16-action-pmrenderpreview.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmisosurface.png cr16-action-pmbox.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmdialogview.png cr16-action-pmradiosity.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmconfiguregraphicalview.png cr22-action-pmdrag.png cr16-action-pmcamera.png cr16-action-pmboundedby.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr22-action-pmlistpattern.png cr16-action-pmfogdeclare.png Makefile.am cr16-action-pmdensitymap.png cr22-action-pmslopemapdeclare.png cr22-action-pmfinish.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pmmatrix.png cr22-action-pminteriortexture.png cr16-action-pmunion.png cr16-action-pmmediadeclare.png cr22-action-pmnormallist.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr16-action-pminsertlastchild.png cr22-action-pmobjectdeclare.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr16-action-pmbumpmap.png cr22-action-pmskysphere.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pmtexturemapdeclare.png cr16-action-pminteriortexture.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr22-action-pmtriangle.png cr16-action-pmremovepoint.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr16-action-pmpigmentmap.png cr22-action-pmprism.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr16-action-pmnormal.png cr22-action-pmcamera.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmconfigureviewlayout.png cr22-action-pmglobalphotons.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr16-action-pmslopemapdeclare.png cr22-action-pmmaterial.png cr22-action-pmcone.png
-+KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr16-action-pmcolorlist.png cr22-action-pmblobsphere.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmaddsubprism.png cr16-action-pmlight.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr16-action-pmrenderpreview.png cr22-action-pmmaterialmap.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmisosurface.png cr16-action-pmbox.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmradiosity.png cr16-action-pmdialogview.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmconfiguregraphicalview.png cr22-action-pmdrag.png cr16-action-pmcamera.png cr16-action-pmboundedby.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr16-action-pmfogdeclare.png cr22-action-pmlistpattern.png Makefile.am cr22-action-pmslopemapdeclare.png cr16-action-pmdensitymap.png cr22-action-pmfinish.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pmmatrix.png cr22-action-pminteriortexture.png cr16-action-pmunion.png cr16-action-pmmediadeclare.png cr22-action-pmnormallist.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr16-action-pmsor.png cr22-action-pmradiosity.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pminteriortexture.png cr16-action-pmtexturemapdeclare.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr22-action-pmtriangle.png cr16-action-pmremovepoint.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr22-action-pmcamera.png cr16-action-pmnormal.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmglobalphotons.png cr22-action-pmconfigureviewlayout.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr16-action-pmblobsphere.png cr22-action-pmlight.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr22-action-pmmaterial.png cr16-action-pmslopemapdeclare.png cr22-action-pmcone.png
++KDE_DIST=cr16-action-pminsertsibling.png cr22-action-pmnormalmapdeclare.png cr22-action-pmpolynom.png cr22-action-pmslopemap.png cr22-action-pmprojectedthrough.png cr22-action-pmblobsphere.png cr16-action-pmcolorlist.png cr16-action-pmaddpoint.png cr22-action-pmconfiguredialogview.png cr22-action-pmslope.png cr16-action-pmsqe.png cr22-action-pmintersection.png cr16-action-pmpigmentlist.png cr22-action-pmfinishdeclare.png cr16-action-pmlight.png cr16-action-pmaddsubprism.png cr16-action-pmquickcolor.png cr16-action-pmpolynom.png cr22-action-pmsor.png cr16-action-pmheightfield.png cr22-action-pmnormalmap.png cr22-action-pmdensitymapdeclare.png cr22-action-pmcolorlist.png cr16-action-pmdeclare.png cr22-action-pmpigmentdeclare.png cr22-action-pmboundedby.png cr22-action-pmtorus.png cr16-action-pminteriortexturedeclare.png cr16-action-pmaddpointabove.png cr16-action-pmnormaldeclare.png cr22-action-pmtexturelist.png cr22-action-pmsolidcolor.png cr22-action-pmquickcolor.png cr22-action-pmtexture.png cr16-action-pmdifference.png cr22-action-pmblob.png cr22-action-pmskyspheredeclare.png cr16-action-pmfinish.png cr22-action-pmmerge.png cr16-action-pmmaterialmap.png cr16-action-pmglview.png cr16-action-pmscale.png cr16-action-pmmaterial.png cr22-action-pmcolormapdeclare.png cr22-action-pmmaterialdeclare.png cr22-action-pmdensitymap.png cr22-action-pmtexturemapdeclare.png cr22-action-pmtranslate.png cr16-action-pmnormalmapdeclare.png cr16-action-pmsolidcolor.png cr22-action-pmunion.png cr22-action-pmrendersettings.png cr16-action-pmrenderpreview.png cr22-action-pmmaterialmap.png cr16-action-pmtext.png cr16-action-pmdrag.png cr16-action-pmbox.png cr16-action-pmisosurface.png cr16-action-pmslope.png cr16-action-pmpigment.png cr22-action-pmobjectlink.png cr16-action-pmtranslate.png cr16-action-pmrainbowdeclare.png cr22-action-pmpigmentmapdeclare.png cr16-action-pmtriangle.png cr16-action-pmphotons.png cr22-action-pmdifference.png cr22-action-pmraw.png cr22-action-pmnormaldeclare.png cr22-action-pmbox.png cr22-action-pmtexturemap.png cr22-action-pmfog.png cr22-action-pmconfiguregrid.png cr22-action-pminteriortexturedeclare.png cr16-action-pminteriordeclare.png cr16-action-pmcomment.png cr16-action-pmwarp.png cr22-action-pmclippedby.png cr16-action-pmdensitymapdeclare.png cr22-action-pmblobcylinder.png cr16-action-pmskysphere.png cr16-action-pmdialogview.png cr16-action-pmradiosity.png cr16-action-pmscene.png cr22-action-pmpigmentlist.png cr16-action-pminserterrors.png cr22-action-pminserterrors.png cr16-action-pmmaterialdeclare.png cr16-action-pmrotate.png cr22-action-pmdrag.png cr22-action-pmconfiguregraphicalview.png cr16-action-pmboundedby.png cr16-action-pmcamera.png cr22-action-pmrender.png cr22-action-pmpigmentmap.png cr22-action-pmlightgroup.png cr22-action-pmspheresweep.png cr22-action-pmsphere.png cr22-action-pmcolormap.png cr22-action-pmsqe.png cr16-action-pmtexturelist.png cr22-action-pmconfigureobjectlibrary.png cr16-action-pmbicubicpatch.png cr22-action-pminterior.png cr16-action-pmglobalphotons.png cr16-action-pmlistpattern.png cr22-action-pmpigment.png cr16-action-pmblobcylinder.png cr16-action-pmjuliafractal.png cr22-action-pmconfigurecolors.png cr16-action-pmfogdeclare.png cr22-action-pmlistpattern.png Makefile.am cr22-action-pmfinish.png cr22-action-pmslopemapdeclare.png cr16-action-pmdensitymap.png cr16-action-pmmesh.png cr22-action-pmtext.png cr16-action-pmobjectlink.png cr22-action-pmglobalsettings.png cr16-action-pmslopemap.png cr16-action-pmskyspheredeclare.png cr16-action-pmdensitylist.png cr16-action-pmlathe.png cr16-action-pmfinishdeclare.png cr22-action-pmcomment.png cr16-action-pmdensitydeclare.png cr16-action-pmrendersettings.png cr16-action-pmplane.png cr22-action-pmlookslike.png cr22-action-pminteriortexture.png cr22-action-pmmatrix.png cr16-action-pmunion.png cr22-action-pmnormallist.png cr16-action-pmmediadeclare.png cr22-action-pmplane.png cr16-action-pmobjectdeclare.png Makefile.in cr22-action-pmscene.png cr16-action-pmlightgroup.png cr22-action-pmimagemap.png cr16-action-pmclippedby.png cr16-action-pmtreeview.png cr22-action-pmradiosity.png cr16-action-pmsor.png cr22-action-pmobjectdeclare.png cr16-action-pminsertlastchild.png cr16-action-pmblendmapmodifiers.png cr22-action-pmconfigureopengl.png cr16-action-pmnormallist.png cr16-action-pmspheresweep.png cr16-action-pmsphere.png cr22-action-pmfogdeclare.png cr16-action-pmpigmentmapdeclare.png cr16-action-pmpigmentdeclare.png cr22-action-pmdensitylist.png cr22-action-pmjuliafractal.png cr16-action-pmglobalsettings.png cr16-action-pmlookslike.png cr22-action-pmdensitydeclare.png cr22-action-pmconfiguretexturepreview.png cr16-action-pminterior.png cr22-action-pmdensity.png cr22-action-pmscale.png cr22-action-pmmedia.png cr16-action-pmmatrix.png cr16-action-pmprojectedthrough.png cr16-action-pmrainbow.png cr22-action-pmskysphere.png cr16-action-pmbumpmap.png cr16-action-pmimagemap.png cr22-action-pmnormal.png cr22-action-pmconfigurepovray.png cr16-action-pmpattern.png cr16-action-pminteriortexture.png cr16-action-pmtexturemapdeclare.png cr16-action-pmcone.png cr16-action-pmtorus.png cr16-action-pmnormalmap.png cr16-action-pmtexturedeclare.png cr22-action-pmwarp.png cr16-action-pmremovepoint.png cr22-action-pmtriangle.png cr16-action-pmblob.png cr16-action-pmdensity.png cr16-action-pmfog.png cr22-action-pmprism.png cr16-action-pmpigmentmap.png cr16-action-pmtexture.png cr16-action-pmcylinder.png cr22-action-pmrainbowdeclare.png cr22-action-pmphotons.png cr22-action-pmblendmapmodifiers.png cr22-action-pmlathe.png cr16-action-pmrender.png cr16-action-pmcolormap.png cr16-action-pmdisc.png cr16-action-pminsertfirstchild.png cr22-action-pmtexturedeclare.png cr22-action-pmrotate.png cr16-action-pmnormal.png cr22-action-pmcamera.png cr16-action-pmprism.png cr22-action-pmdeclare.png cr22-action-pmheightfield.png cr22-action-pmconfigureviewlayout.png cr22-action-pmglobalphotons.png cr22-action-pmbumpmap.png cr22-action-pmmediadeclare.png cr22-action-pmrenderpreview.png cr16-action-pmintersection.png cr16-action-pmtexturemap.png cr16-action-pmmerge.png cr22-action-pmcylinder.png cr16-action-pmmedia.png cr22-action-pmconfigureobjects.png cr16-action-pmcolormapdeclare.png cr22-action-pmpattern.png cr22-action-pmmesh.png cr22-action-pmisosurface.png cr22-action-pmlight.png cr16-action-pmblobsphere.png cr22-action-pmdisc.png cr22-action-pminteriordeclare.png cr22-action-pmbicubicpatch.png cr22-action-pmrainbow.png cr16-action-pmraw.png cr16-action-pmslopemapdeclare.png cr22-action-pmmaterial.png cr22-action-pmcone.png
#>+ 2
docs-am:
-
+@@ -602,465 +611,465 @@
#>+ 462
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
+ $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
$(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
@@ -48506,17 +59183,26 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
@@ -48524,7 +59210,12 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
@@ -48536,28 +59227,41 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ $(mkinstalldirs) $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
@@ -48565,7 +59269,9 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
@@ -48575,78 +59281,50 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
$(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguretexturepreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
@@ -48657,15 +59335,18 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
@@ -48682,177 +59363,181 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguredialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmedia.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregraphicalview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlightgroup.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslope.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinish.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurecolors.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmesh.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureopengl.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
$(INSTALL_DATA) $(srcdir)/cr16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfiguregrid.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigurepovray.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriordeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterial.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormalmapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjectlibrary.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureobjects.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmisosurface.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtreeview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormal.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminterior.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmphotons.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmdialogview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
@@ -48864,33 +59549,17 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmslopemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfinishdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmglview.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolorlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmsqe.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmradiosity.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmconfigureviewlayout.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmmaterialdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmnormaldeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmwarp.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
@@ -48909,18 +59578,19 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmediadeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturelist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-pmpigmentlist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pminteriortexture.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
@@ -48941,17 +59611,27 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
@@ -48959,7 +59639,12 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
@@ -48971,27 +59656,41 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcamera.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
@@ -48999,7 +59698,9 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
@@ -49009,22 +59710,17 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcone.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
@@ -49035,23 +59731,34 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlightgroup.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
@@ -49059,15 +59766,16 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmisosurface.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
@@ -49081,213 +59789,184 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmspheresweep.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrotate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturemap.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertlastchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmjuliafractal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguredialogview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminterior.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtorus.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmwarp.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlight.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblendmapmodifiers.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmedia.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmboundedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinish.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlight.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmunion.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmphotons.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmunion.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalphotons.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslopemapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmesh.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtranslate.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolormap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentlist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriordeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminserterrors.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmradiosity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdensitydeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdisc.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmimagemap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslope.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertfirstchild.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinish.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrotate.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurecolors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmesh.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmslope.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlightgroup.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmclippedby.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmlookslike.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrainbowdeclare.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdrag.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpattern.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmatrix.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcamera.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitydeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfinishdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrender.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pminteriortexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbox.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtext.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmrendersettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpolynom.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureopengl.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskyspheredeclare.png
-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcone.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfiguregrid.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigurepovray.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriordeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterial.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormalmapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureobjects.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmisosurface.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmremovepoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprojectedthrough.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtreeview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormal.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturelist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbicubicpatch.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdifference.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminterior.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmphotons.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmblobcylinder.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmraw.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdialogview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmscene.png
@@ -49299,33 +59978,17 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmpigmentmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmslopemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbumpmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfinishdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmglview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolorlist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmprism.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmediadeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtranslate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmintersection.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmsqe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdisc.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormaldeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcomment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsor.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmradiosity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmmaterialdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmnormaldeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmwarp.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmbicubicpatch.png
@@ -49344,18 +60007,19 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmediadeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbumpmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmquickcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmbox.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturelist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmpigmentlist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmcomment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pminteriortexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
#>+ 15
force-reedit:
@@ -49466,110 +60130,89 @@
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtorus.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrendersettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrender.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertfirstchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmscene.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbumpmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pminserterrors.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmraw.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmatrix.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlight.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmheightfield.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmclippedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmplane.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsqr.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
$(INSTALL_DATA) $(srcdir)/lo16-action-pmquickcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmimagemap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensity.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtext.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitylist.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddsubprism.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsolidcolor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectlink.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmobjectdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertlastchild.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitymapdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcomment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigmentdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmblob.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
@@ -49578,21 +60221,43 @@
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmcone.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmremovepoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsor.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmaterialmap.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmsqr.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmboundedby.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
$(INSTALL_DATA) $(srcdir)/lo16-action-pmscale.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmunion.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdisc.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmbox.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobsphere.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfog.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmbicubicpatch.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmfogdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmskyspheredeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-- $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmlookslike.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pminsertsibling.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmmerge.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmcamera.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpolynom.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmlathe.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrotate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmjuliafractal.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmtexture.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbow.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmglobalsettings.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtranslate.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrenderpreview.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblobcylinder.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmdensitydeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmpigment.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmblendmapmodifiers.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmrainbowdeclare.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-pmtriangle.png $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
@@ -49601,110 +60266,89 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtorus.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrendersettings.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrender.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdifference.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertfirstchild.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscene.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbumpmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminserterrors.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmraw.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmatrix.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlight.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmheightfield.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmclippedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmplane.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
-rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmquickcolor.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmimagemap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensity.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtext.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitylist.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddsubprism.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsolidcolor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymap.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectlink.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmobjectdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsphere.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertlastchild.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitymapdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcomment.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigmentdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdrag.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblob.png
@@ -49713,21 +60357,43 @@
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexturedeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcone.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmremovepoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsor.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmaterialmap.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskysphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmsqr.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmboundedby.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlistpattern.png
-rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmscale.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmunion.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdisc.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbox.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobsphere.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfog.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmbicubicpatch.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmfogdeclare.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmskyspheredeclare.png
-- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlookslike.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pminsertsibling.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmmerge.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmcamera.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpolynom.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmlathe.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrotate.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmjuliafractal.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtexture.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbow.png
- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmglobalsettings.png
-+ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtranslate.png
+- -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpoint.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrenderpreview.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmintersection.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblobcylinder.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmdensitydeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmpigment.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmaddpointabove.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmblendmapmodifiers.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmrainbowdeclare.png
++ -rm -f $(DESTDIR)$(pmtoolbardir)/locolor/16x16/actions/pmtriangle.png
#>+ 15
force-reedit:
@@ -50022,32 +60688,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,19 +641,19 @@
-
- #>+ 16
+@@ -634,18 +643,18 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/hi48-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kruler.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kruler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kruler.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kruler.png
#>+ 15
+ force-reedit:
--- ksnapshot/Makefile.in
+++ ksnapshot/Makefile.in
@@ -163,6 +163,7 @@
@@ -50145,34 +60807,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -841,21 +850,21 @@
+@@ -839,23 +848,23 @@
+
+ #>+ 19
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- $(INSTALL_DATA) $(srcdir)/hisc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksnapshot.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/hi22-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-ksnapshot.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-ksnapshot.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksnapshot.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksnapshot.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksnapshot.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ksnapshot.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksnapshot.png
#>+ 15
force-reedit:
@@ -50273,6 +60937,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -813,22 +822,22 @@
+ mocs: KSVGReader.moc
+
+ #>+ 3
+-KSVGCanvas.moc: $(srcdir)/KSVGCanvas.h
+- $(MOC) $(srcdir)/KSVGCanvas.h -o KSVGCanvas.moc
++KSVGLoader.moc: $(srcdir)/KSVGLoader.h
++ $(MOC) $(srcdir)/KSVGLoader.h -o KSVGLoader.moc
+
+ #>+ 2
+-mocs: KSVGCanvas.moc
++mocs: KSVGLoader.moc
+
+ #>+ 3
+-KSVGLoader.moc: $(srcdir)/KSVGLoader.h
+- $(MOC) $(srcdir)/KSVGLoader.h -o KSVGLoader.moc
++KSVGCanvas.moc: $(srcdir)/KSVGCanvas.h
++ $(MOC) $(srcdir)/KSVGCanvas.h -o KSVGCanvas.moc
+
+ #>+ 2
+-mocs: KSVGLoader.moc
++mocs: KSVGCanvas.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f KSVGReader.moc KSVGCanvas.moc KSVGLoader.moc
++ -rm -f KSVGReader.moc KSVGLoader.moc KSVGCanvas.moc
+
+ #>+ 2
+ KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop
--- ksvg/dom/Makefile.in
+++ ksvg/dom/Makefile.in
@@ -279,6 +279,7 @@
@@ -51054,7 +61748,7 @@
#>+ 2
-KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
-+KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedPathDataImpl.h SVGAnimatedEnumerationImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGZoomEventImpl.h SVGVKernElementImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGLangSpaceImpl.h SVGFEBlendElementImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
++KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
#>+ 2
docs-am:
@@ -51543,6 +62237,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1015,18 +1024,18 @@
+ mocs: svgcreator.moc
+
+ #>+ 3
+-ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
+- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
++ksvg_factory.moc: $(srcdir)/ksvg_factory.h
++ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
+
+ #>+ 2
+-mocs: ksvg_plugin.moc
++mocs: ksvg_factory.moc
+
+ #>+ 3
+-ksvg_factory.moc: $(srcdir)/ksvg_factory.h
+- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
++ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
++ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
+
+ #>+ 2
+-mocs: ksvg_factory.moc
++mocs: ksvg_plugin.moc
+
+ #>+ 8
+ svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
+@@ -1039,7 +1048,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
++ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
+
+ #>+ 2
+ KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
+@@ -1090,7 +1099,7 @@
+
+
+ #>+ 11
+-libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
++libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
+ @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
+ rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
--- ksvg/test/external/Makefile.in
+++ ksvg/test/external/Makefile.in
@@ -157,6 +157,7 @@
@@ -52125,104 +62862,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -945,18 +954,18 @@
- mocs: aboutwidget.moc
-
- #>+ 3
--printing.moc: $(srcdir)/printing.h
-- $(MOC) $(srcdir)/printing.h -o printing.moc
-+filefinder.moc: $(srcdir)/filefinder.h
-+ $(MOC) $(srcdir)/filefinder.h -o filefinder.moc
-
- #>+ 2
--mocs: printing.moc
-+mocs: filefinder.moc
-
- #>+ 3
--filefinder.moc: $(srcdir)/filefinder.h
-- $(MOC) $(srcdir)/filefinder.h -o filefinder.moc
-+printing.moc: $(srcdir)/printing.h
-+ $(MOC) $(srcdir)/printing.h -o printing.moc
-
- #>+ 2
--mocs: filefinder.moc
-+mocs: printing.moc
-
- #>+ 3
- imagewindow.moc: $(srcdir)/imagewindow.h
-@@ -980,18 +989,18 @@
- mocs: generalwidget.moc
-
- #>+ 3
--mainwidget.moc: $(srcdir)/mainwidget.h
-- $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
-+kurlwidget.moc: $(srcdir)/kurlwidget.h
-+ $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
-
- #>+ 2
--mocs: mainwidget.moc
-+mocs: kurlwidget.moc
-
- #>+ 3
--kurlwidget.moc: $(srcdir)/kurlwidget.h
-- $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
-+mainwidget.moc: $(srcdir)/mainwidget.h
-+ $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
-
- #>+ 2
--mocs: kurlwidget.moc
-+mocs: mainwidget.moc
-
- #>+ 3
- kuickimage.moc: $(srcdir)/kuickimage.h
-@@ -1037,7 +1046,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f filewidget.moc aboutwidget.moc printing.moc filefinder.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc kuickimage.moc defaultswidget.moc kuickfile.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-+ -rm -f filewidget.moc aboutwidget.moc filefinder.moc printing.moc imagewindow.moc slideshowwidget.moc generalwidget.moc kurlwidget.moc mainwidget.moc kuickimage.moc defaultswidget.moc kuickfile.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
-
- #>+ 2
- KDE_DIST=aboutwidget.h imagewindow.h kuickconfigdlg.h filecache.h mainwidget.cpp kuickdata.h generalwidget.h defaultswidget.h imdata.h hi32-app-kuickshow.png kuickshow.desktop kuickglobals.h filewidget.h kuick.h Makefile.am kuickfile.h imlibwidget.h Makefile.in mainwidget.h kuickimage.h printing.h hi22-app-kuickshow.png filefinder.h hi16-app-kuickshow.png slideshowwidget.h kuickshow.h kurlwidget.h version.h
-@@ -1047,17 +1056,17 @@
-
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kuickshow.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuickshow.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kuickshow.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kuickshow.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuickshow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuickshow.png
-
- #>+ 15
- force-reedit:
-@@ -1098,7 +1107,7 @@
-
-
- #>+ 11
--libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
-+libkdeinit_kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @echo 'creating libkdeinit_kuickshow_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kuickshow_la.all_cpp.files libkdeinit_kuickshow_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kuickshow_la.all_cpp.final; \
-@@ -1110,7 +1119,7 @@
- rm -f libkdeinit_kuickshow_la.all_cpp.final libkdeinit_kuickshow_la.all_cpp.files
-
- #>+ 11
--kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
-+kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp $(srcdir)/kuickfile.cpp $(srcdir)/kuickimage.cpp $(srcdir)/filecache.cpp aboutwidget.moc filewidget.moc printing.moc filefinder.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickimage.moc kuickfile.moc imlibwidget.moc kuickconfigdlg.moc kuickshow.moc
- @echo 'creating kuickshow_la.all_cpp.cpp ...'; \
- rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
--- kview/config/Makefile.in
+++ kview/config/Makefile.in
@@ -178,6 +178,7 @@
@@ -53236,7 +63875,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1053,20 +1062,20 @@
+@@ -1053,19 +1062,19 @@
#>+ 16
install-kde-icons:
@@ -53244,25 +63883,21 @@
- $(INSTALL_DATA) $(srcdir)/hi22-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
$(INSTALL_DATA) $(srcdir)/hi48-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kview.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kview.png
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kview.png
#>+ 15
- force-reedit:
--- kview/modules/browser/Makefile.in
+++ kview/modules/browser/Makefile.in
@@ -161,6 +161,7 @@
@@ -54233,31 +64868,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1364,18 +1373,18 @@
- mocs: renderedDocumentPage.moc
-
- #>+ 3
--kviewpart_iface.moc: $(srcdir)/kviewpart_iface.h
-- $(MOC) $(srcdir)/kviewpart_iface.h -o kviewpart_iface.moc
-+kviewpart.moc: $(srcdir)/kviewpart.h
-+ $(MOC) $(srcdir)/kviewpart.h -o kviewpart.moc
-
- #>+ 2
--mocs: kviewpart_iface.moc
-+mocs: kviewpart.moc
-
- #>+ 3
--kviewpart.moc: $(srcdir)/kviewpart.h
-- $(MOC) $(srcdir)/kviewpart.h -o kviewpart.moc
-+kviewpart_iface.moc: $(srcdir)/kviewpart_iface.h
-+ $(MOC) $(srcdir)/kviewpart_iface.h -o kviewpart_iface.moc
-
- #>+ 2
--mocs: kviewpart.moc
-+mocs: kviewpart_iface.moc
-
- #>+ 3
- documentWidget.moc: $(srcdir)/documentWidget.h
@@ -1406,11 +1415,11 @@
mocs: documentRenderer.moc
@@ -54273,27 +64883,88 @@
#>+ 3
sizePreview.moc: $(srcdir)/sizePreview.h
-@@ -1420,11 +1429,11 @@
+@@ -1420,18 +1429,11 @@
mocs: sizePreview.moc
#>+ 3
-tableOfContents.moc: $(srcdir)/tableOfContents.h
- $(MOC) $(srcdir)/tableOfContents.h -o tableOfContents.moc
+-
+-#>+ 2
+-mocs: tableOfContents.moc
+-
+-#>+ 3
+-history.moc: $(srcdir)/history.h
+- $(MOC) $(srcdir)/history.h -o history.moc
+kviewshell.moc: $(srcdir)/kviewshell.h
+ $(MOC) $(srcdir)/kviewshell.h -o kviewshell.moc
#>+ 2
--mocs: tableOfContents.moc
+-mocs: history.moc
+mocs: kviewshell.moc
#>+ 3
- history.moc: $(srcdir)/history.h
+ kmultipage.moc: $(srcdir)/kmultipage.h
+@@ -1441,11 +1443,11 @@
+ mocs: kmultipage.moc
+
+ #>+ 3
+-pageView.moc: $(srcdir)/pageView.h
+- $(MOC) $(srcdir)/pageView.h -o pageView.moc
++history.moc: $(srcdir)/history.h
++ $(MOC) $(srcdir)/history.h -o history.moc
+
+ #>+ 2
+-mocs: pageView.moc
++mocs: history.moc
+
+ #>+ 3
+ renderedDocumentPagePixmap.moc: $(srcdir)/renderedDocumentPagePixmap.h
+@@ -1455,18 +1457,18 @@
+ mocs: renderedDocumentPagePixmap.moc
+
+ #>+ 3
+-zoom.moc: $(srcdir)/zoom.h
+- $(MOC) $(srcdir)/zoom.h -o zoom.moc
++pageView.moc: $(srcdir)/pageView.h
++ $(MOC) $(srcdir)/pageView.h -o pageView.moc
+
+ #>+ 2
+-mocs: zoom.moc
++mocs: pageView.moc
+
+ #>+ 3
+-marklist.moc: $(srcdir)/marklist.h
+- $(MOC) $(srcdir)/marklist.h -o marklist.moc
++zoom.moc: $(srcdir)/zoom.h
++ $(MOC) $(srcdir)/zoom.h -o zoom.moc
+
+ #>+ 2
+-mocs: marklist.moc
++mocs: zoom.moc
+
+ #>+ 3
+ pageSize.moc: $(srcdir)/pageSize.h
+@@ -1476,6 +1478,13 @@
+ mocs: pageSize.moc
+
+ #>+ 3
++marklist.moc: $(srcdir)/marklist.h
++ $(MOC) $(srcdir)/marklist.h -o marklist.moc
++
++#>+ 2
++mocs: marklist.moc
++
++#>+ 3
+ empty_multipage.moc: $(srcdir)/empty_multipage.h
+ $(MOC) $(srcdir)/empty_multipage.h -o empty_multipage.moc
+
@@ -1513,10 +1522,10 @@
#>+ 3
clean-metasources:
- -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc kviewshell.moc sizePreview.moc tableOfContents.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
-+ -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart.moc kviewpart_iface.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc tableOfContents.moc sizePreview.moc kviewshell.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc zoom.moc marklist.moc pageSize.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
++ -rm -f searchWidget.moc renderedDocumentPage.moc kviewpart_iface.moc kviewpart.moc documentWidget.moc emptyRenderer.moc pageSizeDialog.moc documentRenderer.moc tableOfContents.moc sizePreview.moc kviewshell.moc kmultipage.moc history.moc renderedDocumentPagePixmap.moc pageView.moc zoom.moc pageSize.moc marklist.moc empty_multipage.moc pageSizeWidget.moc documentPageCache.moc
#>+ 2
-KDE_DIST=optionDialogGUIWidget_base.ui kviewshell.h DESIGN emptymultipage.desktop kvsprefs.kcfgc pageSizeWidget_base.ui kprintDialogPage_pageoptions.h kviewshell.kcfg kviewpart.h tableOfContents.h Makefile.am empty_multipage.h pageSizeWidget.h kmultipage.desktop Mainpage.dox Makefile.in searchWidget.h kviewerpart.rc sizePreview.h emptyRenderer.h units.h optionDialogAccessibilityWidget.ui marklist.h kviewpart_iface.h pageSizeDialog.h kviewshell.rc
@@ -54301,6 +64972,15 @@
#>+ 4
clean-idl:
+@@ -1606,7 +1615,7 @@
+ rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
+
+ #>+ 11
+-libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/pageView.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/renderedDocumentPage.cpp $(srcdir)/renderedDocumentPagePixmap.cpp $(srcdir)/renderedDocumentPagePrinter.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/searchWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp $(srcdir)/tableOfContents.cpp $(srcdir)/kprintDialogPage_pageoptions.cpp kmultipageInterface_skel.cpp kvsprefs.cpp searchWidget.moc renderedDocumentPage.moc documentWidget.moc documentRenderer.moc tableOfContents.moc history.moc kmultipage.moc pageView.moc renderedDocumentPagePixmap.moc pageSize.moc marklist.moc documentPageCache.moc
++libkmultipage_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmultipage.cpp $(srcdir)/pageView.cpp $(srcdir)/marklist.cpp $(srcdir)/units.cpp $(srcdir)/pageSize.cpp $(srcdir)/simplePageSize.cpp $(srcdir)/renderedDocumentPage.cpp $(srcdir)/renderedDocumentPagePixmap.cpp $(srcdir)/renderedDocumentPagePrinter.cpp $(srcdir)/documentPageCache.cpp $(srcdir)/documentWidget.cpp $(srcdir)/searchWidget.cpp $(srcdir)/selection.cpp $(srcdir)/documentRenderer.cpp $(srcdir)/history.cpp $(srcdir)/tableOfContents.cpp $(srcdir)/kprintDialogPage_pageoptions.cpp kmultipageInterface_skel.cpp kvsprefs.cpp searchWidget.moc renderedDocumentPage.moc documentWidget.moc documentRenderer.moc tableOfContents.moc kmultipage.moc history.moc renderedDocumentPagePixmap.moc pageView.moc marklist.moc pageSize.moc documentPageCache.moc
+ @echo 'creating libkmultipage_la.all_cpp.cpp ...'; \
+ rm -f libkmultipage_la.all_cpp.files libkmultipage_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
--- kviewshell/pics/icons/Makefile.in
+++ kviewshell/pics/icons/Makefile.in
@@ -115,6 +115,7 @@
@@ -54398,35 +65078,38 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -602,23 +611,23 @@
+@@ -601,24 +610,24 @@
+
#>+ 20
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
+- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
- $(INSTALL_DATA) $(srcdir)/hi22-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
-+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions
-+ $(INSTALL_DATA) $(srcdir)/hi48-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
-+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
+- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/hi48-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions
- $(INSTALL_DATA) $(srcdir)/hi32-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
-- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions
- $(INSTALL_DATA) $(srcdir)/hi16-action-selectiontool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
-- $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/hi48-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ $(mkinstalldirs) $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-movetool.png $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
-+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
-+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
+- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
+ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/22x22/actions/selectiontool.png
- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/selectiontool.png
-- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/16x16/actions/movetool.png
-- -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/48x48/actions/movetool.png
++ -rm -f $(DESTDIR)$(kviewparticondir)/hicolor/32x32/actions/movetool.png
#>+ 15
force-reedit:
@@ -54527,6 +65210,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -765,16 +774,16 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kviewshell.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kviewshell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kviewshell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kviewshell.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
+
+ #>+ 15
--- kviewshell/plugins/djvu/libdjvu/Makefile.in
+++ kviewshell/plugins/djvu/libdjvu/Makefile.in
@@ -54,9 +54,9 @@
@@ -54727,7 +65430,7 @@
install-info: install-info-am
-@@ -820,20 +825,20 @@
+@@ -820,27 +825,27 @@
ps-am:
@@ -54753,6 +65456,14 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=DataPool.h MMX.h JB2Image.h DjVuGlobal.h DjVmNav.h DjVuFileCache.h GException.h GScaler.h DjVmDir.h GOS.h UnicodeByteStream.h ByteStream.h DjVuText.h DjVmDoc.h BSByteStream.h DjVuErrorList.h DjVuAnno.h GPixmap.h README.djvulibre DjVuDumpHelper.h GContainer.h DjVuImage.h ZPCodec.h DjVmDir0.h DjVuDocEditor.h Makefile.am DjVuMessage.h GBitmap.h GRect.h DjVuFile.h GIFFManager.h DjVuNavDir.h Makefile.in JPEGDecoder.h DjVuToPS.h DjVuInfo.h GString.h IW44Image.h MMRDecoder.h GMapAreas.h configure.in.in XMLTags.h DjVuDocument.h DjVuPort.h DjVuMessageLite.h Template.h DjVuPalette.h debug.h GThreads.h GURL.h XMLParser.h Arrays.h IFFByteStream.h GSmartPointer.h
++KDE_DIST=DataPool.h MMX.h JB2Image.h DjVuGlobal.h DjVmNav.h DjVuFileCache.h GException.h GScaler.h DjVmDir.h GOS.h UnicodeByteStream.h ByteStream.h DjVuText.h DjVmDoc.h BSByteStream.h DjVuErrorList.h DjVuAnno.h GPixmap.h DjVuDumpHelper.h README.djvulibre GContainer.h DjVuImage.h ZPCodec.h DjVmDir0.h DjVuDocEditor.h Makefile.am DjVuMessage.h GBitmap.h GRect.h DjVuFile.h GIFFManager.h DjVuNavDir.h Makefile.in JPEGDecoder.h DjVuToPS.h DjVuInfo.h GString.h IW44Image.h MMRDecoder.h GMapAreas.h configure.in.in XMLTags.h DjVuDocument.h DjVuPort.h DjVuMessageLite.h Template.h DjVuPalette.h debug.h GThreads.h GURL.h XMLParser.h Arrays.h IFFByteStream.h GSmartPointer.h
+
+ #>+ 2
+ docs-am:
--- kviewshell/plugins/djvu/Makefile.in
+++ kviewshell/plugins/djvu/Makefile.in
@@ -182,6 +182,7 @@
@@ -55083,74 +65794,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -949,18 +958,18 @@
-
-
- #>+ 3
--scandialog.moc: $(srcdir)/scandialog.h
-- $(MOC) $(srcdir)/scandialog.h -o scandialog.moc
-+kgammatable.moc: $(srcdir)/kgammatable.h
-+ $(MOC) $(srcdir)/kgammatable.h -o kgammatable.moc
-
- #>+ 2
--mocs: scandialog.moc
-+mocs: kgammatable.moc
-
- #>+ 3
--kgammatable.moc: $(srcdir)/kgammatable.h
-- $(MOC) $(srcdir)/kgammatable.h -o kgammatable.moc
-+scandialog.moc: $(srcdir)/scandialog.h
-+ $(MOC) $(srcdir)/scandialog.h -o scandialog.moc
-
- #>+ 2
--mocs: kgammatable.moc
-+mocs: scandialog.moc
-
- #>+ 3
- scansourcedialog.moc: $(srcdir)/scansourcedialog.h
-@@ -984,18 +993,18 @@
- mocs: scanparams.moc
-
- #>+ 3
--kscanoption.moc: $(srcdir)/kscanoption.h
-- $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
-+massscandialog.moc: $(srcdir)/massscandialog.h
-+ $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
-
- #>+ 2
--mocs: kscanoption.moc
-+mocs: massscandialog.moc
-
- #>+ 3
--massscandialog.moc: $(srcdir)/massscandialog.h
-- $(MOC) $(srcdir)/massscandialog.h -o massscandialog.moc
-+kscanoption.moc: $(srcdir)/kscanoption.h
-+ $(MOC) $(srcdir)/kscanoption.h -o kscanoption.moc
-
- #>+ 2
--mocs: massscandialog.moc
-+mocs: kscanoption.moc
-
- #>+ 3
- dispgamma.moc: $(srcdir)/dispgamma.h
-@@ -1055,7 +1064,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-+ -rm -f kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc dispgamma.moc imgscaledialog.moc devselector.moc img_canvas.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-
- #>+ 2
- KDE_DIST=scanservice.desktop Makefile.am scandialog.h Makefile.in configure.in.in configure.in.bot kscandoc.h
-@@ -1106,7 +1115,7 @@
-
-
- #>+ 11
--libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp kgammatable.moc scandialog.moc scansourcedialog.moc previewer.moc scanparams.moc massscandialog.moc kscanoption.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
-+libkscan_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kscandevice.cpp $(srcdir)/kscanslider.cpp $(srcdir)/kgammatable.cpp $(srcdir)/kscanoption.cpp $(srcdir)/kscanoptset.cpp $(srcdir)/gammadialog.cpp $(srcdir)/dispgamma.cpp $(srcdir)/scansourcedialog.cpp $(srcdir)/scanparams.cpp $(srcdir)/massscandialog.cpp $(srcdir)/devselector.cpp $(srcdir)/scandialog.cpp $(srcdir)/img_canvas.cpp $(srcdir)/previewer.cpp $(srcdir)/imgscaledialog.cpp $(srcdir)/sizeindicator.cpp $(srcdir)/imgscaninfo.cpp scandialog.moc kgammatable.moc scansourcedialog.moc previewer.moc scanparams.moc kscanoption.moc massscandialog.moc imgscaledialog.moc dispgamma.moc img_canvas.moc devselector.moc sizeindicator.moc gammadialog.moc kscanslider.moc kscandevice.moc
- @echo 'creating libkscan_la.all_cpp.cpp ...'; \
- rm -f libkscan_la.all_cpp.files libkscan_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkscan_la.all_cpp.final; \
--- libkscan/pics/Makefile.in
+++ libkscan/pics/Makefile.in
@@ -115,6 +115,7 @@
@@ -55248,27 +65891,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -601,16 +610,16 @@
+@@ -601,15 +610,15 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_color.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-palette_halftone.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
$(INSTALL_DATA) $(srcdir)/cr16-action-palette_gray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-palette_lineart.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_color.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_halftone.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_lineart.png
#>+ 15
- force-reedit:
--- Makefile.in
+++ Makefile.in
@@ -149,6 +149,7 @@
@@ -55383,7 +66023,7 @@
#>+ 2
-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=Mainpage.dox stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am acinclude.m4 configure Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list