rev 4115 - trunk/packages/koffice/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Thu Jul 13 17:57:05 UTC 2006
Author: isaac
Date: 2006-07-13 17:11:33 +0000 (Thu, 13 Jul 2006)
New Revision: 4115
Modified:
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buildprep
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-07-13 17:11:12 UTC (rev 4114)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-07-13 17:11:33 UTC (rev 4115)
@@ -3838,13 +3838,15 @@
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- autocorrect/Makefile.in
+++ autocorrect/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3854,24 +3856,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -534,7 +540,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -532,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -3880,7 +3928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +578,9 @@
+@@ -570,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3892,10 +3940,682 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- config.h.in
++++ config.h.in
+@@ -233,22 +233,22 @@
+ /* Define the PREFIX where to install this package */
+ #undef PREFIX
+
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+
+ /* Define to 1 if you have the ANSI C header files. */
--- configure
+++ configure
-@@ -278,15 +278,15 @@
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59e.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+ done
+
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+@@ -63,157 +124,386 @@
+
+
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
++# CDPATH.
++$as_unset CDPATH
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++ if (eval ":") 2>/dev/null; then
++ as_have_required=yes
++else
++ as_have_required=no
+ fi
+
++ if test $as_have_required = yes && (eval ":
++(as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
+
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++ as_lineno_1=\$LINENO
++ as_lineno_2=\$LINENO
++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++ :
++else
++ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
++ case $as_dir in
+ /*)
+- if ("$as_dir/$as_base" -c '
++ for as_base in sh bash ksh sh5; do
++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++ done;;
++ esac
++done
++IFS=$as_save_IFS
++
++
++ for as_shell in $as_candidate_shells $SHELL; do
++ # Try only shells which exist, to save several forks.
++ if test -f "$as_shell" &&
++ { ("$as_shell") 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++ CONFIG_SHELL=$as_shell
++ as_have_required=yes
++ if { "$as_shell" 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++ (exit $1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++ break
++fi
++
++fi
++
++ done
++
++ if test "x$CONFIG_SHELL" != x; then
++ for as_var in BASH_ENV ENV
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++ if test $as_have_required = no; then
++ echo This script requires a shell more modern than all the
++ echo shells that I found on your system. Please install a
++ echo modern shell, or manually run the script under such a
++ echo shell if you do have one.
++ { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++ echo No shell found that supports shell functions.
++ echo Please tell autoconf at gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
++}
++
++
++
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
++ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
++else
++ rm -f conf$$.dir
++ mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+@@ -222,7 +512,19 @@
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works. Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ as_executable_p="test -x"
++else
++ as_executable_p=:
++fi
++rm -f conf$$.file
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+
+
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,15 @@
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -3913,17 +4633,966 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -464,7 +464,8 @@
+@@ -395,29 +688,26 @@
+
+ tagnames=${tagnames+${tagnames},}F77
+
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete. It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,500 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-# include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
-+ac_subdirs_all="$ac_subdirs_all koffice-1.5.1"
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koffice_1_5_1_SUBDIR_included_TRUE koffice_1_5_1_SUBDIR_included_FALSE subdirs koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
++KDECONFIG
++kde_libs_prefix
++kde_libs_htmldir
++CONF_FILES
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
++CPP
++CXX
++CXXFLAGS
++ac_ct_CXX
++CXXDEPMODE
++am__fastdepCXX_TRUE
++am__fastdepCXX_FALSE
++WOVERLOADED_VIRTUAL
++HAVE_GCC_VISIBILITY
++unsermake_enable_pch_TRUE
++unsermake_enable_pch_FALSE
++USE_EXCEPTIONS
++USE_RTTI
++CXXCPP
++NOOPT_CXXFLAGS
++NOOPT_CFLAGS
++ENABLE_PERMISSIVE_FLAG
++LDFLAGS_AS_NEEDED
++LDFLAGS_NEW_DTAGS
++KDE_USE_FINAL_TRUE
++KDE_USE_FINAL_FALSE
++KDE_USE_CLOSURE_TRUE
++KDE_USE_CLOSURE_FALSE
++KDE_NO_UNDEFINED
++KDE_USE_NMCHECK_TRUE
++KDE_USE_NMCHECK_FALSE
++GREP
++EGREP
++LN_S
++ECHO
++AR
++RANLIB
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++KDE_PLUGIN
++KDE_CHECK_PLUGIN
++MSGFMT
++GMSGFMT
++XGETTEXT
++LIBUTIL
++LIBCOMPAT
++LIBCRYPT
++LIBRESOLV
++LIB_POLL
++FRAMEWORK_COREAUDIO
++LIBSOCKET
++X_EXTRA_LIBS
++LIBUCB
++LIBDL
++KDE_USE_FPIE
++KDE_USE_PIE
++include_x11_TRUE
++include_x11_FALSE
++XMKMF
++X_PRE_LIBS
++LIB_X11
++LIB_XRENDER
++LIBSM
++X_INCLUDES
++X_LDFLAGS
++x_includes
++x_libraries
++QTE_NORTTI
++LIB_XEXT
++LIBPTHREAD
++USE_THREADS
++KDE_MT_LDFLAGS
++KDE_MT_LIBS
++USER_INCLUDES
++USER_LDFLAGS
++LIBZ
++LIBPNG
++LIBJPEG
++qt_libraries
++qt_includes
++QT_INCLUDES
++QT_LDFLAGS
++PERL
++MOC
++UIC
++UIC_TR
++LIB_QT
++LIB_QPE
++kde_qtver
++KDE_EXTRA_RPATH
++KDE_RPATH
++X_RPATH
++kde_libraries
++kde_includes
++KDE_LDFLAGS
++KDE_INCLUDES
++all_includes
++all_libraries
++AUTODIRS
++include_ARTS_TRUE
++include_ARTS_FALSE
++MAKEKDEWIDGETS
++KCONFIG_COMPILER
++KCFG_DEPENDENCIES
++DCOPIDLNG
++DCOPIDL
++DCOPIDL2CPP
++DCOP_DEPENDENCIES
++MCOPIDL
++ARTSCCONFIG
++MEINPROC
++KDE_XSL_STYLESHEET
++XMLLINT
++kde_htmldir
++kde_appsdir
++kde_icondir
++kde_sounddir
++kde_datadir
++kde_locale
++kde_confdir
++kde_kcfgdir
++kde_mimedir
++kde_wallpaperdir
++kde_bindir
++xdg_appsdir
++xdg_menudir
++xdg_directorydir
++kde_templatesdir
++kde_servicesdir
++kde_servicetypesdir
++kde_moduledir
++kdeinitdir
++kde_styledir
++kde_widgetdir
++LIB_KDED
++LIB_KDECORE
++LIB_KDEUI
++LIB_KIO
++LIB_KJS
++LIB_SMB
++LIB_KAB
++LIB_KABC
++LIB_KHTML
++LIB_KSPELL
++LIB_KPARTS
++LIB_KDEPRINT
++LIB_KUTILS
++LIB_KDEPIM
++LIB_KIMPROXY
++LIB_KNEWSTUFF
++LIB_KDNSSD
++LIB_KUNITTEST
++LIB_KSYCOCA
++LIB_KFILE
++LIB_KFM
++QTDOCDIR
++KDE_HAVE_DOT
++DOXYGEN
++DOXYGEN_PROJECT_NAME
++DOXYGEN_PROJECT_NUMBER
++KDE_HAS_DOXYGEN
++LIBMAGICK_LIBS
++LIBMAGICK_LDFLAGS
++LIBMAGICK_CPPFLAGS
++LIBMAGICK_RPATH
++include_imagemagick_filter_TRUE
++include_imagemagick_filter_FALSE
++need_kde32_compatibility_TRUE
++need_kde32_compatibility_FALSE
++need_kde33_compatibility_TRUE
++need_kde33_compatibility_FALSE
++need_kde34_compatibility_TRUE
++need_kde34_compatibility_FALSE
++need_kde351_compatibility_TRUE
++need_kde351_compatibility_FALSE
++need_kde31_compatibility_TRUE
++need_kde31_compatibility_FALSE
++OPENEXR_LIBS
++OPENEXR_CFLAGS
++OPENEXR_RPATH
++have_openexr_TRUE
++have_openexr_FALSE
++LIBTIFF
++have_tiff_TRUE
++have_tiff_FALSE
++have_png_TRUE
++have_png_FALSE
++have_jpeg_TRUE
++have_jpeg_FALSE
++PKG_CONFIG
++LIBEXIF_CFLAGS
++LIBEXIF_LIBS
++have_exif_TRUE
++have_exif_FALSE
++include_jpeg_filter_TRUE
++include_jpeg_filter_FALSE
++include_tiff_filter_TRUE
++include_tiff_filter_FALSE
++LIBWV2_LIBS
++LIBWV2_CFLAGS
++LIBWV2_RPATH
++include_wv2_msword_filter_TRUE
++include_wv2_msword_filter_FALSE
++LIBPAPER
++LIBWPD_LIBS
++LIBWPD_CFLAGS
++LIBWPD_RPATH
++include_wpd_filter_TRUE
++include_wpd_filter_FALSE
++LIBXSLT_LIBS
++LIBXSLT_CFLAGS
++LIBXSLT_RPATH
++LIBXML_LIBS
++LIBXML_CFLAGS
++LIBXML_RPATH
++include_XSLTFILTERS_TRUE
++include_XSLTFILTERS_FALSE
++LIBFREETYPE_LIBS
++LIBFREETYPE_CFLAGS
++LIBFREETYPE_RPATH
++LIBART_LIBS
++LIBART_CFLAGS
++LIBART_RPATH
++LIBFONTCONFIG_LIBS
++LIBFONTCONFIG_CFLAGS
++LIBFONTCONFIG_RPATH
++have_readline_TRUE
++have_readline_FALSE
++LIBREADLINE
++LIB_KEXI_KMDI
++LIB_KEXI_KMDI_INCLUDES
++MYSQL_INC
++MYSQL_LIBS
++compile_mysql_plugin_TRUE
++compile_mysql_plugin_FALSE
++PG_INCDIR
++PG_LIBDIR
++compile_pgsql_plugin_TRUE
++compile_pgsql_plugin_FALSE
++PQXX_INCDIR
++PQXX_LIBDIR
++LIB_KFEEDBACK
++INC_KFEEDBACK
++use_kexifeedback_TRUE
++use_kexifeedback_FALSE
++PYTHONINC
++PYTHONLIB
++LIBPYTHON
++PYTHONMODDIR
++LIB_XINPUTEXT
++LCMS_LIBS
++include_kunittest_tests_TRUE
++include_kunittest_tests_FALSE
++GLINC
++GLLIB
++use_kjsembed_TRUE
++use_kjsembed_FALSE
++SQLDIR
++include_sql_TRUE
++include_sql_FALSE
++KWMF_INCLUDES
++KSTORE_INCLUDES
++KOTEXT_INCLUDES
++KOPAINTER_INCLUDES
++KOPALETTE_INCLUDES
++KOFFICECORE_INCLUDES
++KOFFICEUI_INCLUDES
++KFORMULA_INCLUDES
++KOPROPERTY_INCLUDES
++KROSS_INCLUDES
++LIB_KOFFICEUI
++LIB_KOFFICECORE
++LIB_KSTORE
++LIB_KOTEXT
++LIB_KOPAINTER
++LIB_KOPALETTE
++LIB_KWMF
++LIB_KOWMF
++LIB_KFORMULA
++LIB_KOPROPERTY
++LIB_KROSS_API
++LIB_KROSS_MAIN
++interfacedir
++KOFFICE_LIBS
++KOFFICE_INCLUDES
++LIBKSPELL2
++compile_kross_TRUE
++compile_kross_FALSE
++compile_kross_python_TRUE
++compile_kross_python_FALSE
++RUBY
++RUBY_ARCHDIR
++RUBY_SITEARCHDIR
++RUBY_SITEDIR
++RUBY_INCLUDEDIR
++RUBY_LIBDIR
++RUBY_LIBRUBYARG
++RUBY_ENABLESHARED
++compile_kross_ruby_TRUE
++compile_kross_ruby_FALSE
++TOPSUBDIRS
++lib_SUBDIR_included_TRUE
++lib_SUBDIR_included_FALSE
++interfaces_SUBDIR_included_TRUE
++interfaces_SUBDIR_included_FALSE
++autocorrect_SUBDIR_included_TRUE
++autocorrect_SUBDIR_included_FALSE
++doc_SUBDIR_included_TRUE
++doc_SUBDIR_included_FALSE
++example_SUBDIR_included_TRUE
++example_SUBDIR_included_FALSE
++karbon_SUBDIR_included_TRUE
++karbon_SUBDIR_included_FALSE
++kchart_SUBDIR_included_TRUE
++kchart_SUBDIR_included_FALSE
++kdgantt_SUBDIR_included_TRUE
++kdgantt_SUBDIR_included_FALSE
++kformula_SUBDIR_included_TRUE
++kformula_SUBDIR_included_FALSE
++kivio_SUBDIR_included_TRUE
++kivio_SUBDIR_included_FALSE
++koshell_SUBDIR_included_TRUE
++koshell_SUBDIR_included_FALSE
++kounavail_SUBDIR_included_TRUE
++kounavail_SUBDIR_included_FALSE
++kpresenter_SUBDIR_included_TRUE
++kpresenter_SUBDIR_included_FALSE
++krita_SUBDIR_included_TRUE
++krita_SUBDIR_included_FALSE
++kspread_SUBDIR_included_TRUE
++kspread_SUBDIR_included_FALSE
++kugar_SUBDIR_included_TRUE
++kugar_SUBDIR_included_FALSE
++mimetypes_SUBDIR_included_TRUE
++mimetypes_SUBDIR_included_FALSE
++pics_SUBDIR_included_TRUE
++pics_SUBDIR_included_FALSE
++plugins_SUBDIR_included_TRUE
++plugins_SUBDIR_included_FALSE
++servicetypes_SUBDIR_included_TRUE
++servicetypes_SUBDIR_included_FALSE
++templates_SUBDIR_included_TRUE
++templates_SUBDIR_included_FALSE
++tools_SUBDIR_included_TRUE
++tools_SUBDIR_included_FALSE
++kword_SUBDIR_included_TRUE
++kword_SUBDIR_included_FALSE
++kplato_SUBDIR_included_TRUE
++kplato_SUBDIR_included_FALSE
++kexi_SUBDIR_included_TRUE
++kexi_SUBDIR_included_FALSE
++filters_SUBDIR_included_TRUE
++filters_SUBDIR_included_FALSE
++compile_filter_KWORD_TRUE
++compile_filter_KWORD_FALSE
++compile_filter_KSPREAD_TRUE
++compile_filter_KSPREAD_FALSE
++compile_filter_KCHART_TRUE
++compile_filter_KCHART_FALSE
++compile_filter_KARBON_TRUE
++compile_filter_KARBON_FALSE
++compile_filter_KPRESENTER_TRUE
++compile_filter_KPRESENTER_FALSE
++compile_filter_KFORMULA_TRUE
++compile_filter_KFORMULA_FALSE
++compile_filter_KUGAR_TRUE
++compile_filter_KUGAR_FALSE
++compile_filter_KRITA_TRUE
++compile_filter_KRITA_FALSE
++compile_filter_KIVIO_TRUE
++compile_filter_KIVIO_FALSE
++compile_plugin_KUGAR_TRUE
++compile_plugin_KUGAR_FALSE
++compile_kexionly_TRUE
++compile_kexionly_FALSE
++compile_lib_KOPAINTER_TRUE
++compile_lib_KOPAINTER_FALSE
++LIBOBJS
++LTLIBOBJS'
ac_subst_files=''
++ ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF'
++
# Initialize some variables set by options.
-@@ -1025,6 +1026,8 @@
+ ac_init_help=
+@@ -492,34 +1265,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+- eval "$ac_prev=\$ac_option"
++ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++ case $ac_option in
++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *) ac_optarg=yes ;;
++ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+- case $ac_option in
++ case $ac_dashdash$ac_option in
++ --)
++ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+@@ -541,12 +1328,18 @@
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+- | --da=*)
++ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++ | --dataroo | --dataro | --datar)
++ ac_prev=datarootdir ;;
++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++ datarootdir=$ac_optarg ;;
++
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+@@ -554,7 +1347,17 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- eval "enable_$ac_feature=no" ;;
++ eval enable_$ac_feature=no ;;
++
++ -docdir | --docdir | --docdi | --doc | --do)
++ ac_prev=docdir ;;
++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++ docdir=$ac_optarg ;;
++
++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++ ac_prev=dvidir ;;
++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1366,7 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "enable_$ac_feature='$ac_optarg'" ;;
++ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1393,12 @@
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++ ac_prev=htmldir ;;
++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++ | --ht=*)
++ htmldir=$ac_optarg ;;
++
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+@@ -618,13 +1423,16 @@
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
++ -localedir | --localedir | --localedi | --localed | --locale)
++ ac_prev=localedir ;;
++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++ localedir=$ac_optarg ;;
++
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+- | --localstate | --localstat | --localsta | --localst \
+- | --locals | --local | --loca | --loc | --lo)
++ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1497,16 @@
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++ ac_prev=pdfdir ;;
++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++ pdfdir=$ac_optarg ;;
++
++ -psdir | --psdir | --psdi | --psd | --ps)
++ ac_prev=psdir ;;
++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++ psdir=$ac_optarg ;;
++
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+@@ -745,11 +1563,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "with_$ac_package='$ac_optarg'" ;;
++ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1572,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+- eval "with_$ac_package=no" ;;
++ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -789,8 +1603,7 @@
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+- eval "$ac_envvar='$ac_optarg'"
++ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+@@ -810,27 +1623,19 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+- eval ac_val=$`echo $ac_var`
+- case $ac_val in
+- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
+- esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
+- eval ac_val=$`echo $ac_var`
++ eval ac_val=\$$ac_var
+ case $ac_val in
+- [\\/$]* | ?:[\\/]* ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
++ [\\/$]* | ?:[\\/]* ) continue;;
++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { (exit 1); exit 1; }; }
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,94 +1662,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+
+
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++ { echo "$as_me: error: Working directory cannot be determined" >&2
++ { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
++ { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+- # Try the directory containing this script, then its parent.
+- ac_confdir=`(dirname "$0") 2>/dev/null ||
++ # Try the directory containing this script, then the parent directory.
++ ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ srcdir=$ac_confdir
+- if test ! -r $srcdir/$ac_unique_file; then
++ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+ else
+ ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+- if test "$ac_srcdir_defaulted" = yes; then
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+- { (exit 1); exit 1; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+- { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++ { (exit 1); exit 1; }; }
++ pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++ srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_env_${ac_var}_value=\$${ac_var}
++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+
+ #
+ # Report the --help message.
+@@ -973,9 +1760,6 @@
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+-_ACEOF
+-
+- cat <<_ACEOF
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+@@ -993,15 +1777,22 @@
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+- --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --infodir=DIR info documentation [PREFIX/info]
+- --mandir=DIR man documentation [PREFIX/man]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -1025,6 +1816,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -3932,23 +5601,994 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -2109,6 +2112,31 @@
+@@ -1042,10 +1835,8 @@
+ of memory)
+ --enable-closure delay template instantiation
+ --enable-nmcheck enable automatic namespace cleanness check
+- --enable-shared[=PKGS]
+- build shared libraries [default=yes]
+- --enable-static[=PKGS]
+- build static libraries [default=no]
++ --enable-shared[=PKGS] build shared libraries [default=yes]
++ --enable-static[=PKGS] build static libraries [default=no]
+ --enable-libsuffix /lib directory suffix (64,32,none,auto=default)
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+@@ -1069,8 +1860,7 @@
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+- --with-tags[=TAGS]
+- include additional configurations [automatic]
++ --with-tags[=TAGS] include additional configurations [automatic]
+ --with-extra-includes=DIR
+ adds non standard include paths
+ --with-extra-libs=DIR adds non standard library paths
+@@ -1104,131 +1894,100 @@
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+- headers in a nonstandard directory <include dir>
++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CXXCPP C++ preprocessor
+ F77 Fortran 77 compiler command
+ FFLAGS Fortran 77 compiler flags
++ XMKMF Path to xmkmf, Makefile generator for X Window System
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ _ACEOF
++ac_status=$?
+ fi
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+- ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d $ac_dir || continue
++ test -d "$ac_dir" || continue
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+- cd $ac_dir
+- # Check for guested configure; otherwise get Cygnus style configure.
+- if test -f $ac_srcdir/configure.gnu; then
+- echo
+- $SHELL $ac_srcdir/configure.gnu --help=recursive
+- elif test -f $ac_srcdir/configure; then
+- echo
+- $SHELL $ac_srcdir/configure --help=recursive
+- elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
+- echo
+- $ac_configure --help
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi
+- cd "$ac_popdir"
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+ fi
+
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59e
+
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+- exit 0
++ exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.59e. Invocation command line was
+
+ $ $0 $@
+
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1247,7 +2006,7 @@
+ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+ /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+ /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+ /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+@@ -1261,6 +2020,7 @@
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+
+ } >&5
+
+@@ -1282,7 +2042,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1293,7 +2052,7 @@
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++ *\'*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+@@ -1315,9 +2074,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
+@@ -1328,8 +2085,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log. We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+@@ -1342,20 +2099,34 @@
+ _ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
+ (set) 2>&1 |
+- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ sed -n \
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+- ;;
++ "s/'\''/'\''\\\\'\'''\''/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++ ;; #(
+ *)
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-}
++ esac |
++ sort
++)
+ echo
+
+ cat <<\_ASBOX
+@@ -1366,22 +2137,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
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+@@ -1393,26 +2170,24 @@
+ ## ----------- ##
+ _ASBOX
+ echo
+- sed "/^$/d" confdefs.h | sort
++ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+- rm -f core *.core &&
+- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++ rm -f core *.core core.conftest.* &&
++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+- ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+
+ # Predefined preprocessor variables.
+
+@@ -1443,14 +2218,17 @@
+
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+- if test "x$prefix" != xNONE; then
+- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+- else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
++if test -n "$CONFIG_SITE"; then
++ set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+ if test -r "$ac_site_file"; then
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1466,8 +2244,8 @@
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+- [\\/]* | ?:[\\/]* ) . $cache_file;;
+- *) . ./$cache_file;;
++ [\\/]* | ?:[\\/]* ) . "$cache_file";;
++ *) . "./$cache_file";;
+ esac
+ fi
+ else
+@@ -1479,12 +2257,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+- eval ac_new_val="\$ac_env_${ac_var}_value"
++ eval ac_old_val=\$ac_cv_env_${ac_var}_value
++ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1509,8 +2286,7 @@
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+@@ -1527,12 +2303,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+
+
+
+@@ -1549,110 +2319,165 @@
+
+
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+- if test -f $ac_dir/install-sh; then
++for ac_dir in admin "$srcdir"/admin; do
++ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+- elif test -f $ac_dir/install.sh; then
++ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+- elif test -f $ac_dir/shtool; then
++ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
++
+
+
+ unset CDPATH
+
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+- ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++ ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+- ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++ if test "x$host_alias" = x; then
++ ac_cv_host=$ac_cv_build
++else
++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+- ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++ if test "x$target_alias" = x; then
++ ac_cv_target=$ac_cv_host
++else
++ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1662,17 +2487,17 @@
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+- program_transform_name="s,^,$program_prefix,;$program_transform_name"
++ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $. echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+
+
+ am__api_version="1.9"
+@@ -1694,8 +2519,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1717,7 +2542,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -1736,21 +2561,22 @@
+ ;;
+ esac
+ done
++IFS=$as_save_IFS
+
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
++ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1764,8 +2590,8 @@
+ if test -z "$kde_save_INSTALL_given" ; then
+ # OK, user hasn't given any INSTALL, autoconf found one for us
+ # now we test, if it supports the -p flag
+- echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+ rm -f confinst.$$.* > /dev/null 2>&1
+ echo "Testtest" > confinst.$$.orig
+ ac_res=no
+@@ -1777,8 +2603,8 @@
+ fi
+ fi
+ rm -f confinst.$$.*
+- echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ fi
+
+ if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1788,8 +2614,8 @@
+ INSTALL_SCRIPT='${INSTALL}'
+ fi
+
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1831,8 +2657,8 @@
+ Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+@@ -1883,8 +2709,8 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1897,54 +2723,57 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$AWK" && break
+ done
+
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-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 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
+ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+- @echo 'ac_maketemp="$(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=`
+-if test -n "$ac_maketemp"; then
+- 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
+- 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=
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -2015,8 +2844,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2029,32 +2858,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2067,27 +2898,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2107,6 +2952,31 @@
+
+
+
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
+
++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
++
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
@@ -3964,31 +6604,4620 @@
unset CDPATH
-@@ -6838,183 +6866,6 @@
+@@ -2125,14 +2995,14 @@
+
+ if test "x$prefix" = "xNONE"; then
+
+- echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+ if test -n "$KDECONFIG"; then
+ kde_cv_path="$KDECONFIG";
+ else
+ kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -2175,8 +3045,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2187,8 +3057,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KDECONFIG=$kde_cv_path
+
+ fi
+@@ -2197,14 +3067,14 @@
+ kde_save_PATH="$PATH"
+ PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+
+- echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+ if test -n "$KDECONFIG"; then
+ kde_cv_path="$KDECONFIG";
+ else
+ kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -2247,8 +3117,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2259,8 +3129,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KDECONFIG=$kde_cv_path
+
+ fi
+@@ -2283,16 +3153,16 @@
+ kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+ kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
+
+- echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking where to install" >&5
++echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
+ if test "x$prefix" = "xNONE"; then
+ prefix=$kde_libs_prefix
+- echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
++ { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
++echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+ else
+ given_prefix=$prefix
+- echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
++ { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
++echo "${ECHO_T}$prefix (as requested)" >&6; }
+ fi
+
+ # And delete superfluous '/' to make compares easier
+@@ -2305,13 +3175,13 @@
+
+
+
+- # Check whether --enable-fast-perl or --disable-fast-perl was given.
++ # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+- enableval="$enable_fast_perl"
+- with_fast_perl=$enableval
++ enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+ with_fast_perl=yes
+-fi;
++fi
++
+
+
+ val=
+@@ -2328,11 +3198,11 @@
+
+
+
+- ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+
+ DEPDIR="${am__leading_dot}deps"
+
+- ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+
+
+ am_make=${MAKE-make}
+@@ -2342,8 +3212,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2370,15 +3240,15 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+- enableval="$enable_dependency_tracking"
++ enableval=$enable_dependency_tracking;
++fi
+
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+@@ -2398,10 +3268,9 @@
+
+
+
+- # Check whether --enable-debug or --disable-debug was given.
++ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+- enableval="$enable_debug"
+-
++ enableval=$enable_debug;
+ case $enableval in
+ yes)
+ kde_use_debug_code="yes"
+@@ -2421,18 +3290,18 @@
+ kde_use_debug_code="no"
+ kde_use_debug_define=no
+
+-fi;
++fi
++
+
+- # Check whether --enable-dummyoption or --disable-dummyoption was given.
++ # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+- enableval="$enable_dummyoption"
++ enableval=$enable_dummyoption;
++fi
+
+-fi;
+
+- # Check whether --enable-strict or --disable-strict was given.
++ # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+- enableval="$enable_strict"
+-
++ enableval=$enable_strict;
+ if test $enableval = "no"; then
+ kde_use_strict_options="no"
+ else
+@@ -2441,12 +3310,12 @@
+
+ else
+ kde_use_strict_options="no"
+-fi;
++fi
+
+- # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+- enableval="$enable_warnings"
+
++ # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++ enableval=$enable_warnings;
+ if test $enableval = "no"; then
+ kde_use_warnings="no"
+ else
+@@ -2455,20 +3324,21 @@
+
+ else
+ kde_use_warnings="yes"
+-fi;
++fi
++
+
+ if test "$kde_use_debug_code" != "no"; then
+ kde_use_warnings=yes
+ fi
+
+- # Check whether --enable-profile or --disable-profile was given.
++ # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+- enableval="$enable_profile"
+- kde_use_profiling=$enableval
++ enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+ kde_use_profiling="no"
+
+-fi;
++fi
++
+
+ CFLAGS=" $CFLAGS"
+
+@@ -2480,8 +3350,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2494,32 +3364,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2532,36 +3404,51 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ else
+ CC="$ac_cv_prog_CC"
+ fi
+
+ if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2574,74 +3461,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
+
++ fi
+ fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2655,7 +3502,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -2666,6 +3513,7 @@
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+@@ -2683,22 +3531,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2711,36 +3560,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$CC" && break
+ done
+ fi
+ if test -z "$CC"; then
+ ac_ct_CC=$CC
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2753,29 +3604,45 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$ac_ct_CC" && break
+ done
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ fi
+
+ fi
+@@ -2788,21 +3655,35 @@
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (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
++{ (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
++{ (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); }
+@@ -2827,46 +3708,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.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+- (eval $ac_link_default) 2>&5
++#
++# 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 { (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
+- # Find the output, starting from the most likely. This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++ # 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
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+- ;;
+- conftest.$ac_ext )
+- # This is the source file.
++ *.$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
++ 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
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2879,19 +3784,23 @@
+ fi
+
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
+
+-# Check the compiler produces executables we can run. If not, either
++# Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+ 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
+@@ -2910,22 +3819,27 @@
+ fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run. If not, either
++# 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
+-
+-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
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if { (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
+@@ -2936,9 +3850,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_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
+@@ -2952,14 +3865,14 @@
+ fi
+
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
++{ 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
++{ 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
+@@ -2979,14 +3892,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
+- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++ for ac_file in conftest.o conftest.obj conftest.*; do
++ test -f "$ac_file" || continue;
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+@@ -3004,12 +3923,12 @@
+
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++{ 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
+@@ -3032,23 +3951,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
+@@ -3057,24 +3989,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3090,23 +4026,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
+@@ -3115,281 +4064,273 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) 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_stdc=$ac_arg
+-break
++ :
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+ _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
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-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 { (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
+- break
++ ac_cv_prog_cc_c89=$ac_arg
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3398,8 +4339,8 @@
+
+ depcc="$CC" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3488,8 +4429,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+@@ -3511,8 +4452,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -3546,8 +4487,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
+@@ -3572,9 +4518,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3584,8 +4531,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
+@@ -3612,6 +4564,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3629,8 +4582,8 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3653,8 +4606,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
+@@ -3679,9 +4637,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3691,8 +4650,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
+@@ -3719,6 +4683,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3769,18 +4734,22 @@
+
+ CXXFLAGS=" $CXXFLAGS"
+
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++ if test -n "$CCC"; then
++ CXX=$CCC
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3793,36 +4762,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++ { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$CXX" && break
+ done
+ fi
+ if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3835,55 +4806,85 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+- CXX=$ac_ct_CXX
++ if test "x$ac_ct_CXX" = x; then
++ CXX="g++"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CXX=$ac_ct_CXX
++ fi
+ fi
+
+-
++ fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (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
++{ (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
++{ (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); }
+
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3906,23 +4907,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
+@@ -3931,24 +4945,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++ ac_cxx_werror_flag=yes
++ ac_cv_prog_cxx_g=no
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3964,23 +4982,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
+@@ -3989,69 +5020,53 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+- CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+- if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+- else
+- CXXFLAGS="-g"
+- fi
+-else
+- if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
+- else
+- CXXFLAGS=
+- fi
+-fi
+-for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ CXXFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+ _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
+@@ -4060,60 +5075,91 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+ _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
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+ fi
+
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4122,8 +5168,8 @@
+
+ depcc="$CXX" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4212,8 +5258,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+@@ -4231,8 +5277,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4257,23 +5303,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
+@@ -4282,13 +5341,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_bad_compiler=yes
++ kde_bad_compiler=yes
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+
+ if test "$kde_bad_compiler" = "yes"; then
+ { { echo "$as_me:$LINENO: error:
+@@ -4330,17 +5390,16 @@
+ fi
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+
+-
+-ac_ext=cc
++ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4368,23 +5427,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
+@@ -4393,7 +5465,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4407,29 +5481,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4456,23 +5529,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
+@@ -4481,7 +5567,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4495,13 +5583,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ WOVERLOADED_VRITUAL=""
+ fi
+@@ -4522,16 +5610,15 @@
+
+ if test "$kde_use_profiling" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4558,23 +5645,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
+@@ -4583,7 +5683,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4597,16 +5699,16 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -4621,16 +5723,15 @@
+ CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4657,23 +5758,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
+@@ -4682,7 +5796,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4696,27 +5812,26 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4741,23 +5856,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
+@@ -4766,7 +5894,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+@@ -4780,13 +5910,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -4794,16 +5924,15 @@
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4830,23 +5959,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
+@@ -4855,7 +5997,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4869,28 +6013,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4917,23 +6060,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
+@@ -4942,7 +6098,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4956,28 +6114,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5004,23 +6161,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
+@@ -5029,7 +6199,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5043,13 +6215,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -5061,13 +6233,13 @@
+ CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+ fi
+
+- # Check whether --enable-pch or --disable-pch was given.
++ # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+- enableval="$enable_pch"
+- kde_use_pch=$enableval
++ enableval=$enable_pch; kde_use_pch=$enableval
+ else
+ kde_use_pch=no
+-fi;
++fi
++
+
+ HAVE_GCC_VISIBILITY=0
+
+@@ -5075,16 +6247,15 @@
+ if test "$GXX" = "yes"; then
+ gcc_no_reorder_blocks=NO
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5111,23 +6282,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
+@@ -5136,7 +6320,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5150,13 +6336,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -5168,16 +6354,15 @@
+ CFLAGS="$CFLAGS -fno-reorder-blocks"
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5204,23 +6389,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
+@@ -5229,7 +6427,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5243,28 +6443,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5291,23 +6490,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
+@@ -5316,7 +6528,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5330,28 +6544,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5378,23 +6591,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
+@@ -5403,7 +6629,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5417,28 +6645,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5465,23 +6692,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
+@@ -5490,7 +6730,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5504,13 +6746,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ USE_EXCEPTIONS=
+ fi
+@@ -5518,37 +6760,37 @@
+ ENABLE_PERMISSIVE_FLAG="-fpermissive"
+
+ if test "$kde_use_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+ echo >conftest.h
+ if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ if test "$kde_gcc_supports_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+ if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
+
+
+- echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5580,23 +6822,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
+@@ -5605,9 +6860,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_opt_noinline_match=no
++ kde_cv_opt_noinline_match=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -5615,8 +6871,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+
+ if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+ CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5636,16 +6892,15 @@
+
+ if test "$kde_use_pch" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5672,23 +6927,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
+@@ -5697,7 +6965,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5711,29 +6981,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5760,23 +7029,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
+@@ -5785,7 +7067,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5799,28 +7083,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5847,23 +7130,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
+@@ -5872,7 +7168,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5886,28 +7184,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5934,23 +7231,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
+@@ -5959,7 +7269,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5973,28 +7285,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6021,23 +7332,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
+@@ -6046,7 +7370,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6060,28 +7386,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6108,23 +7433,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
+@@ -6133,7 +7471,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6147,13 +7487,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -6260,13 +7600,13 @@
+ fi
+
+
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6296,8 +7636,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
+@@ -6322,9 +7667,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6334,8 +7680,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
+@@ -6362,6 +7713,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6379,8 +7731,8 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6403,8 +7755,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
+@@ -6429,9 +7786,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6441,8 +7799,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
+@@ -6469,6 +7832,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6495,16 +7859,15 @@
+ NOOPT_CFLAGS=-O0
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6531,23 +7894,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
+@@ -6556,7 +7932,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6570,22 +7948,21 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+- # Check whether --enable-coverage or --disable-coverage was given.
++ # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+- enableval="$enable_coverage"
+-
++ enableval=$enable_coverage;
+ if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+ ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+ ac_coverage_linker="-lgcc"
+@@ -6601,36 +7978,36 @@
+ CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+ LDFLAGS="$LDFLAGS $ac_coverage_linker"
+
+-fi;
++fi
++
+
+
+
+
+
+
+- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++ # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+- enableval="$enable_new_ldflags"
+- kde_use_new_ldflags=$enableval
++ enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+ kde_use_new_ldflags=no
+-fi;
++fi
++
+
+ LDFLAGS_AS_NEEDED=""
+ LDFLAGS_NEW_DTAGS=""
+ if test "x$kde_use_new_ldflags" = "xyes"; then
+ LDFLAGS_NEW_DTAGS=""
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6657,23 +8034,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
+@@ -6682,7 +8072,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6696,29 +8088,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6745,23 +8136,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
+@@ -6770,7 +8174,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6784,13 +8190,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+
+ fi
+@@ -6800,13 +8206,13 @@
+
+
+
+- # Check whether --enable-final or --disable-final was given.
++ # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+- enableval="$enable_final"
+- kde_use_final=$enableval
++ enableval=$enable_final; kde_use_final=$enableval
+ else
+ kde_use_final=no
+-fi;
++fi
++
+
+ if test "x$kde_use_final" = "xyes"; then
+ KDE_USE_FINAL_TRUE=""
+@@ -6819,13 +8225,13 @@
+
+
+
+- # Check whether --enable-closure or --disable-closure was given.
++ # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+- enableval="$enable_closure"
+- kde_use_closure=$enableval
++ enableval=$enable_closure; kde_use_closure=$enableval
+ else
+ kde_use_closure=no
+-fi;
++fi
++
+
+ KDE_NO_UNDEFINED=""
+ if test "x$kde_use_closure" = "xyes"; then
+@@ -6836,214 +8242,36 @@
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
--
--
--
++
++
++
++
++ # 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
+
+
++ 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
+
- 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'
--
--
+
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -4145,10 +11374,131 @@
-
- ;;
- esac
- fi
+- fi
+-
+-
+-
+-
+-
+- # Check whether --enable-nmcheck or --disable-nmcheck was given.
+-if test "${enable_nmcheck+set}" = set; then
+- enableval="$enable_nmcheck"
+- kde_use_nmcheck=$enableval
+-else
+- kde_use_nmcheck=no
+-fi;
+-
+- 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
-@@ -7192,7 +7043,7 @@
+-
+-
+-
+-
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+- enableval="$enable_shared"
+- p=${PACKAGE-default}
++ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+@@ -7062,12 +8290,12 @@
+ esac
+ else
+ enable_shared=yes
+-fi;
++fi
++
+
+-# Check whether --enable-static or --disable-static was given.
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
+- enableval="$enable_static"
+- p=${PACKAGE-default}
++ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+@@ -7086,7 +8314,8 @@
+ esac
+ else
+ enable_static=no
+-fi;
++fi
++
+
+
+
+@@ -7095,11 +8324,11 @@
+ if test -z "$kdelibsuff"; then
+ kdelibsuff="no"
+ fi
+- # Check whether --enable-libsuffix or --disable-libsuffix was given.
++ # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
+- enableval="$enable_libsuffix"
+- kdelibsuff=$enableval
+-fi;
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
++
+
+ if test "$kdelibsuff" = "auto"; then
+
+@@ -7120,8 +8349,8 @@
+ kdelibsuff=
+ fi
+ if test -z "$kdelibsuff"; then
+- echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++ { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7137,14 +8366,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+
+- echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++ { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+ fi
+
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+- enableval="$enable_fast_install"
+- p=${PACKAGE-default}
++ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+@@ -7163,10 +8391,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
+@@ -7190,7 +8419,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
@@ -4157,7 +11507,225 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7297,7 +7148,7 @@
+@@ -7219,37 +8448,184 @@
+ fi
+
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
++
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_GREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++else
++ ac_cv_path_GREP=$GREP
++fi
++
++
++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
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- 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
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
+ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++ $ac_path_EGREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++else
++ ac_cv_path_EGREP=$EGREP
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++
++
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -7278,11 +8654,11 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7295,7 +8671,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,
@@ -4166,7 +11734,27 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7331,7 +7182,7 @@
+@@ -7315,21 +8691,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4175,7 +11763,33 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7361,6 +7212,15 @@
+@@ -7339,29 +8715,38 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4189,9 +11803,14 @@
+ ;;
+esac
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7371,36 +7231,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7369,56 +8754,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -4259,7 +11878,37 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7447,44 +7314,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7445,44 +8837,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4314,7 +11963,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7500,7 +7359,7 @@
+@@ -7498,7 +8882,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4323,7 +11972,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
-@@ -7516,43 +7375,27 @@
+@@ -7514,43 +8898,27 @@
esac
;;
@@ -4379,7 +12028,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
-@@ -7571,32 +7414,22 @@
+@@ -7569,32 +8937,22 @@
;;
openbsd*)
@@ -4415,7 +12064,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]'
-@@ -7617,10 +7450,13 @@
+@@ -7615,17 +8973,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4430,7 +12079,16 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7636,6 +7472,9 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7634,14 +8995,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -4440,16 +12098,27 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7670,7 +7509,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7668,7 +9032,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7673 "configure"' > conftest.$ac_ext
-+ echo '#line 7512 "configure"' > conftest.$ac_ext
+- echo '#line 7671 "configure"' > conftest.$ac_ext
++ echo '#line 9035 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7713,14 +7552,13 @@
+@@ -7711,14 +9075,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4466,7 +12135,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7732,7 +7570,6 @@
+@@ -7730,7 +9093,6 @@
esac
;;
*64-bit*)
@@ -4474,7 +12143,82 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7827,6 +7664,26 @@
+@@ -7755,8 +9117,8 @@
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7782,23 +9144,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
+@@ -7807,8 +9182,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-lt_cv_cc_needs_belf=no
++ lt_cv_cc_needs_belf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -7818,13 +9194,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -4501,39 +12245,515 @@
esac
-@@ -8219,6 +8076,243 @@
+@@ -7832,8 +9228,8 @@
- done
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7857,23 +9253,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
+@@ -7882,8 +9291,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+@@ -7940,6 +9350,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -7959,18 +9370,27 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-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
+@@ -7983,12 +9403,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -8011,9 +9433,9 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -8027,23 +9449,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
+@@ -8052,12 +9487,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8072,18 +9509,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8094,23 +9532,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
+@@ -8119,15 +9570,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8136,8 +9588,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
+@@ -8161,9 +9618,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8187,25 +9645,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8217,217 +9669,538 @@
+
+ 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
-+ ac_ext=cc
++ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+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:8312:" \
+- "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
@@ -4543,16 +12763,40 @@
+# 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
@@ -4565,32 +12809,81 @@
+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
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
+
+- 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
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_prog_f77_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -4612,6 +12905,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -4629,8 +12923,8 @@
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
@@ -4653,8 +12947,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
@@ -4679,9 +12978,10 @@
+ # Broken: fails on valid input.
+continue
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
-+ # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -4691,8 +12991,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
@@ -4719,6 +13024,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -4734,7 +13040,7 @@
+ { (exit 1); exit 1; }; }
+fi
+
-+ac_ext=cc
++ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -4742,19 +13048,291 @@
+
+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'
-@@ -8311,7 +8405,7 @@
++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; }
++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
++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; }
++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 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; }
++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
++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; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ test -n "$ac_ct_F77" && break
++done
++
++ if test "x$ac_ct_F77" = x; then
++ F77=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ F77=$ac_ct_F77
++ fi
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
++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
++ 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
++
++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
++
++ 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
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++
++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; }
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8456,13 +10229,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- # Provide some information about the compiler.
--echo "$as_me:8314:" \
-+echo "$as_me:8408:" \
- "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
-@@ -8464,7 +8558,7 @@
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4763,7 +13341,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8493,20 +8587,70 @@
+@@ -8491,20 +10264,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4840,7 +13418,33 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8543,9 +8687,6 @@
+@@ -8515,19 +10338,19 @@
+ fi
+
+ if test -n $lt_cv_sys_max_cmd_len ; then
+- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+- echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
++ { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+
+
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8541,9 +10364,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4850,7 +13454,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'"
-@@ -8567,14 +8708,30 @@
+@@ -8565,14 +10385,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'"
;;
@@ -4883,7 +13487,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8592,14 +8749,17 @@
+@@ -8590,14 +10426,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4903,8 +13507,41 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8761,7 +8921,7 @@
+@@ -8715,15 +10554,15 @@
+ lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+- echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++ { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+- echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8737,8 +10576,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+
+
+@@ -8759,7 +10598,7 @@
+
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
@@ -4912,7 +13549,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8781,7 +8941,7 @@
+@@ -8779,7 +10618,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4921,7 +13558,313 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9038,6 +9198,7 @@
+@@ -8789,8 +10628,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8803,32 +10642,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8841,27 +10682,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- AR=$ac_ct_AR
++ if test "x$ac_ct_AR" = x; then
++ AR="false"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
++ fi
+ else
+ AR="$ac_cv_prog_AR"
+ fi
+@@ -8869,8 +10724,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8883,32 +10738,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8921,27 +10778,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- RANLIB=$ac_ct_RANLIB
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ RANLIB=$ac_ct_RANLIB
++ fi
+ else
+ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -8949,8 +10820,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8963,32 +10834,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9001,27 +10874,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9036,6 +10923,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -4929,7 +13872,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9057,15 +9218,26 @@
+@@ -9055,21 +10943,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -4958,7 +13901,15 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9091,7 +9263,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9089,7 +10988,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4967,7 +13918,31 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9153,7 +9325,7 @@
+@@ -9121,17 +11020,17 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+- echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9151,7 +11050,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4976,7 +13951,52 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9248,68 +9420,25 @@
+@@ -9183,11 +11082,11 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ else
+@@ -9202,21 +11101,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+
+-# Check whether --with-pic or --without-pic was given.
++# Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then
+- withval="$with_pic"
+- pic_mode="$withval"
++ withval=$with_pic; pic_mode="$withval"
+ else
+ pic_mode=default
+-fi;
++fi
++
+ test -z "$pic_mode" && pic_mode=default
+
+ # Use C for the default configuration in the libtool script
+@@ -9246,68 +11145,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5060,7 +14080,18 @@
## CAVEAT EMPTOR:
-@@ -9338,18 +9467,20 @@
+@@ -9321,8 +11177,8 @@
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9336,26 +11192,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 \
@@ -5068,13 +14099,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9344: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9473: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9342: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11198: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9348: \$? = $ac_status" >&5
-+ echo "$as_me:9477: \$? = $ac_status" >&5
+- echo "$as_me:9346: \$? = $ac_status" >&5
++ echo "$as_me:11202: \$? = $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
@@ -5086,7 +14117,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9410,6 +9541,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+@@ -9369,8 +11227,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9408,6 +11266,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5098,7 +14150,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9426,7 +9562,7 @@
+@@ -9424,7 +11287,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5107,7 +14159,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9452,6 +9588,16 @@
+@@ -9450,6 +11313,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5124,7 +14176,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9463,7 +9609,7 @@
+@@ -9461,7 +11334,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.
@@ -5133,7 +14185,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9487,12 +9633,19 @@
+@@ -9485,12 +11358,19 @@
;;
linux*)
@@ -5154,7 +14206,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9507,15 +9660,15 @@
+@@ -9505,15 +11385,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5176,7 +14228,7 @@
;;
sunos4*)
-@@ -9524,7 +9677,7 @@
+@@ -9522,7 +11402,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5185,7 +14237,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9537,6 +9690,17 @@
+@@ -9535,6 +11415,17 @@
fi
;;
@@ -5203,7 +14255,28 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9571,18 +9735,20 @@
+@@ -9546,16 +11437,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9569,26 +11460,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 \
@@ -5211,13 +14284,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9577: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9741: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9581: \$? = $ac_status" >&5
-+ echo "$as_me:9745: \$? = $ac_status" >&5
+- echo "$as_me:9579: \$? = $ac_status" >&5
++ echo "$as_me:11470: \$? = $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
@@ -5229,25 +14302,37 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9603,7 +9769,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -9601,7 +11494,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9613,6 +9779,48 @@
+@@ -9611,8 +11504,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -5274,8 +14359,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+ :
@@ -5284,10 +14369,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9625,38 +9833,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9623,60 +11558,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5308,13 +14395,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9644: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9845: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9642: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9648: \$? = $ac_status" >&5
-+ echo "$as_me:9849: \$? = $ac_status" >&5
+- echo "$as_me:9646: \$? = $ac_status" >&5
++ echo "$as_me:11574: \$? = $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
@@ -5338,7 +14425,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9727,6 +9933,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -9686,8 +11619,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+@@ -9725,6 +11658,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5355,7 +14481,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9737,6 +9953,10 @@
+@@ -9735,6 +11678,10 @@
with_gnu_ld=no
fi
;;
@@ -5366,7 +14492,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9747,6 +9967,27 @@
+@@ -9745,6 +11692,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5394,7 +14520,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9784,7 +10025,7 @@
+@@ -9782,7 +11750,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5403,7 +14529,7 @@
else
ld_shlibs=no
fi
-@@ -9794,13 +10035,13 @@
+@@ -9792,13 +11760,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'
@@ -5420,7 +14546,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
-@@ -9809,23 +10050,70 @@
+@@ -9807,23 +11775,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5496,7 +14622,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9839,13 +10127,40 @@
+@@ -9837,40 +11852,62 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5509,12 +14635,34 @@
fi
;;
+- sunos4*)
+- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- wlarc=
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- ;;
+-
+- *)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+ ld_shlibs=no
+ ld_shlibs=no
+- fi
+- ;;
+- esac
+ cat <<_LT_EOF 1>&2
-+
+
+- if test "$ld_shlibs" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
@@ -5536,33 +14684,24 @@
+ esac
+ ;;
+
- sunos4*)
- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
-@@ -9855,24 +10170,19 @@
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ sunos4*)
++ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ wlarc=
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ ;;
++
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
- ld_shlibs=no
+- whole_archive_flag_spec=
++ ld_shlibs=no
fi
- ;;
- esac
-
-- if test "$ld_shlibs" = yes; then
-- runpath_var=LD_RUN_PATH
-- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-- export_dynamic_flag_spec='${wl}--export-dynamic'
-- # ancient GNU ld didn't support --whole-archive et. al.
-- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
-- whole_archive_flag_spec=
-- fi
++ ;;
++ esac
++
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
@@ -5571,7 +14710,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9884,7 +10194,7 @@
+@@ -9882,7 +11919,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -5580,7 +14719,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9906,9 +10216,21 @@
+@@ -9904,9 +11941,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
@@ -5604,7 +14743,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9925,7 +10247,7 @@
+@@ -9923,7 +11972,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -5613,7 +14752,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`
-@@ -9944,8 +10266,12 @@
+@@ -9942,8 +11991,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -5626,7 +14765,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9953,22 +10279,23 @@
+@@ -9951,22 +12004,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -5657,7 +14796,58 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10019,14 +10346,13 @@
+@@ -9982,23 +12036,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
+@@ -10012,19 +12079,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5675,7 +14865,61 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10085,13 +10411,11 @@
+@@ -10043,23 +12111,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
+@@ -10073,7 +12154,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10083,13 +12166,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -5692,7 +14936,7 @@
fi
fi
;;
-@@ -10104,7 +10428,7 @@
+@@ -10102,7 +12183,7 @@
ld_shlibs=no
;;
@@ -5701,7 +14945,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10114,13 +10438,13 @@
+@@ -10112,13 +12193,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5718,7 +14962,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.
-@@ -10130,52 +10454,52 @@
+@@ -10128,52 +12209,52 @@
;;
darwin* | rhapsody*)
@@ -5811,7 +15055,7 @@
fi
;;
-@@ -10209,16 +10533,25 @@
+@@ -10207,16 +12288,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5840,7 +15084,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
-@@ -10232,47 +10565,62 @@
+@@ -10230,47 +12320,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -5909,25 +15153,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'
-@@ -10286,7 +10634,7 @@
+@@ -10284,7 +12389,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5936,7 +15180,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'
-@@ -10296,7 +10644,7 @@
+@@ -10294,7 +12399,7 @@
link_all_deplibs=yes
;;
@@ -5945,7 +15189,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10319,7 +10667,8 @@
+@@ -10317,7 +12422,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
@@ -5955,7 +15199,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10329,7 +10678,7 @@
+@@ -10327,7 +12433,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5964,7 +15208,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10340,14 +10689,14 @@
+@@ -10338,14 +12444,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5981,7 +15225,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'
-@@ -10359,13 +10708,13 @@
+@@ -10357,13 +12463,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5997,7 +15241,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10373,21 +10722,15 @@
+@@ -10371,21 +12477,15 @@
hardcode_libdir_separator=:
;;
@@ -6023,7 +15267,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'
-@@ -10396,8 +10739,18 @@
+@@ -10394,8 +12494,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6044,7 +15288,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10406,7 +10759,7 @@
+@@ -10404,7 +12514,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.
@@ -6053,7 +15297,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10454,36 +10807,45 @@
+@@ -10452,36 +12562,45 @@
fi
;;
@@ -6120,8 +15364,14 @@
;;
uts4*)
-@@ -10502,11 +10864,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10496,15 +12615,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -6132,7 +15382,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -10539,6 +10896,7 @@
+@@ -10522,8 +12636,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -10537,6 +12651,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -6140,7 +15401,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10574,7 +10932,7 @@
+@@ -10559,20 +12674,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6149,7 +15427,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10584,7 +10942,20 @@
+@@ -10582,7 +12697,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6171,7 +15449,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10649,7 +11020,7 @@
+@@ -10647,7 +12775,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6180,7 +15458,7 @@
;;
beos*)
-@@ -10658,7 +11029,7 @@
+@@ -10656,7 +12784,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6189,7 +15467,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10674,7 +11045,7 @@
+@@ -10672,7 +12800,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6198,7 +15476,7 @@
need_version=no
need_lib_prefix=no
-@@ -10686,7 +11057,8 @@
+@@ -10684,7 +12812,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6208,7 +15486,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10716,7 +11088,7 @@
+@@ -10714,7 +12843,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6217,7 +15495,7 @@
;;
esac
;;
-@@ -10739,7 +11111,7 @@
+@@ -10737,7 +12866,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6226,7 +15504,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"`
-@@ -10762,7 +11134,7 @@
+@@ -10760,7 +12889,7 @@
dynamic_linker=no
;;
@@ -6235,7 +15513,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10774,8 +11146,17 @@
+@@ -10772,8 +12901,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6255,7 +15533,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10793,14 +11174,19 @@
+@@ -10791,14 +12929,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6277,7 +15555,7 @@
esac
;;
-@@ -10820,9 +11206,9 @@
+@@ -10818,9 +12961,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6289,7 +15567,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10837,7 +11223,7 @@
+@@ -10835,7 +12978,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6298,7 +15576,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10848,7 +11234,7 @@
+@@ -10846,7 +12989,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6307,7 +15585,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10860,6 +11246,18 @@
+@@ -10858,6 +13001,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6326,7 +15604,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10910,22 +11308,19 @@
+@@ -10908,22 +13063,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6355,7 +15633,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,
-@@ -10935,6 +11330,30 @@
+@@ -10933,6 +13085,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6386,7 +15664,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10944,7 +11363,7 @@
+@@ -10942,7 +13118,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6395,7 +15673,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10972,8 +11391,13 @@
+@@ -10970,8 +13146,13 @@
openbsd*)
version_type=sunos
@@ -6410,7 +15688,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
-@@ -10993,7 +11417,7 @@
+@@ -10991,7 +13172,7 @@
os2*)
libname_spec='$name'
@@ -6419,7 +15697,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11011,13 +11435,6 @@
+@@ -11009,13 +13190,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6433,7 +15711,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11043,7 +11460,7 @@
+@@ -11041,7 +13215,7 @@
need_version=yes
;;
@@ -6442,7 +15720,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'
-@@ -11076,6 +11493,29 @@
+@@ -11074,6 +13248,29 @@
fi
;;
@@ -6472,17 +15750,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11091,12 +11531,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11085,16 +13282,21 @@
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
@@ -6492,7 +15778,722 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11739,7 +12184,7 @@
+@@ -11114,8 +13316,8 @@
+ # directories.
+ hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -11128,29 +13330,29 @@
+
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ ;;
+ *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+ fi
+@@ -11182,8 +13384,8 @@
+
+ darwin*)
+ # if libdl is installed we need to link against it
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11196,39 +13398,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11237,14 +13452,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11258,8 +13474,8 @@
+ ;;
+
+ *)
+- echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11286,52 +13502,59 @@
+
+ #undef shl_load
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shl_load ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+ ;
+ return 0;
+ }
+ _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
+@@ -11340,18 +13563,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shl_load=no
++ ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11364,39 +13588,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11405,19 +13642,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11444,52 +13682,59 @@
+
+ #undef dlopen
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+ ;
+ return 0;
+ }
+ _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
+@@ -11498,18 +13743,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_dlopen=no
++ ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11522,39 +13768,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11563,19 +13822,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11588,39 +13848,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11629,19 +13902,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_svld_dlopen=no
++ ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11654,39 +13928,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -11695,14 +13982,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_dld_link=no
++ ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11737,13 +14025,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -6501,16 +16502,24 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11755,7 +12200,7 @@
+
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11753,7 +14041,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11758 "configure"
-+#line 12203 "configure"
+-#line 11756 "configure"
++#line 14044 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11812,6 +12257,8 @@
+@@ -11810,6 +14098,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -6519,7 +16528,7 @@
exit (status);
}
-@@ -11821,12 +12268,12 @@
+@@ -11819,12 +14109,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6534,25 +16543,35 @@
esac
else :
# compilation failed
-@@ -11841,7 +12288,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11835,13 +14125,13 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11853,7 +12300,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11851,7 +14141,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11856 "configure"
-+#line 12303 "configure"
+-#line 11854 "configure"
++#line 14144 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11910,6 +12357,8 @@
+@@ -11908,6 +14198,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -6561,7 +16580,7 @@
exit (status);
}
-@@ -11919,12 +12368,12 @@
+@@ -11917,12 +14209,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6576,17 +16595,38 @@
esac
else :
# compilation failed
-@@ -11957,7 +12406,7 @@
+@@ -11933,8 +14225,8 @@
+
+
fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -11955,19 +14247,19 @@
+ fi
+
-# Report which librarie types wil actually be built
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -11969,7 +12418,7 @@
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -6594,7 +16634,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11978,47 +12427,10 @@
+@@ -11976,58 +14268,21 @@
fi
;;
@@ -6642,8 +16682,25 @@
- fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12044,7 +12456,8 @@
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12042,7 +14297,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.
@@ -6653,7 +16710,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 \
-@@ -12158,11 +12571,11 @@
+@@ -12156,11 +14412,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -6667,7 +16724,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12192,6 +12605,12 @@
+@@ -12190,6 +14446,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6680,7 +16737,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12203,6 +12622,9 @@
+@@ -12201,6 +14463,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -6690,7 +16747,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12222,7 +12644,7 @@
+@@ -12220,7 +14485,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6699,7 +16756,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12253,7 +12675,7 @@
+@@ -12251,7 +14516,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6708,7 +16765,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12268,7 +12690,7 @@
+@@ -12266,7 +14531,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -6717,7 +16774,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12495,7 +12917,10 @@
+@@ -12493,7 +14758,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.
@@ -6729,7 +16786,23 @@
fi
-@@ -12530,6 +12955,9 @@
+@@ -12506,11 +14774,11 @@
+ CC="$lt_save_CC"
+
+
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+- withval="$with_tags"
+- tagnames="$withval"
+-fi;
++ withval=$with_tags; tagnames="$withval"
++fi
++
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+@@ -12528,6 +14796,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -6739,18 +16812,20 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12560,7 +12988,9 @@
+@@ -12558,8 +14829,10 @@
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+- ac_ext=cc
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
++ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12580,6 +13010,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12578,6 +14851,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -6758,7 +16833,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12597,7 +13028,7 @@
+@@ -12595,7 +14869,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -6767,7 +16842,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12607,17 +13038,34 @@
+@@ -12605,17 +14879,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -6803,7 +16878,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12628,18 +13076,27 @@
+@@ -12626,18 +14917,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -6834,7 +16909,48 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12710,7 +13167,7 @@
+@@ -12651,18 +14951,18 @@
+ # Set up default GNU C++ configuration
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -12691,11 +14991,11 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12708,7 +15008,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,
@@ -6843,7 +16959,27 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12744,7 +13201,7 @@
+@@ -12728,21 +15028,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6852,7 +16988,18 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12763,8 +13220,8 @@
+@@ -12752,8 +15052,8 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+@@ -12761,8 +15061,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
@@ -6863,7 +17010,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12790,7 +13247,7 @@
+@@ -12788,7 +15088,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.
@@ -6872,7 +17019,18 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12821,8 +13278,23 @@
+@@ -12803,8 +15103,8 @@
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+@@ -12819,8 +15119,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6898,7 +17056,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12839,7 +13311,7 @@
+@@ -12837,7 +15152,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -6907,7 +17065,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`
-@@ -12858,8 +13330,12 @@
+@@ -12856,8 +15171,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -6920,7 +17078,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12868,15 +13344,16 @@
+@@ -12866,15 +15185,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6941,8 +17099,61 @@
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.
-@@ -12935,13 +13412,12 @@
+@@ -12896,23 +15216,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
+@@ -12926,20 +15259,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -6957,7 +17168,61 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13000,16 +13476,26 @@
+@@ -12958,23 +15292,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
+@@ -12988,7 +15335,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12998,16 +15347,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -6989,7 +17254,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13023,12 +13509,12 @@
+@@ -13021,12 +15380,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'
@@ -7004,7 +17269,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
-@@ -13037,70 +13523,81 @@
+@@ -13035,70 +15394,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7138,7 +17403,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13111,14 +13608,14 @@
+@@ -13109,14 +15479,14 @@
;;
esac
;;
@@ -7155,7 +17420,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13135,12 +13632,12 @@
+@@ -13133,12 +15503,12 @@
# location of the library.
case $cc_basename in
@@ -7171,7 +17436,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13149,11 +13646,11 @@
+@@ -13147,11 +15517,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.
@@ -7185,7 +17450,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13163,33 +13660,22 @@
+@@ -13161,33 +15531,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -7226,7 +17491,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13200,17 +13686,20 @@
+@@ -13198,17 +15557,20 @@
esac
case $cc_basename in
@@ -7253,7 +17518,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13226,12 +13715,15 @@
+@@ -13224,12 +15586,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -7273,7 +17538,7 @@
;;
esac
fi
-@@ -13242,11 +13734,25 @@
+@@ -13240,11 +15605,25 @@
;;
esac
;;
@@ -7301,7 +17566,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13257,9 +13763,9 @@
+@@ -13255,9 +15634,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7313,7 +17578,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13270,14 +13776,14 @@
+@@ -13268,14 +15647,14 @@
;;
linux*)
case $cc_basename in
@@ -7331,7 +17596,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13295,20 +13801,44 @@
+@@ -13293,20 +15672,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7382,7 +17647,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13336,7 +13866,7 @@
+@@ -13334,7 +15737,7 @@
;;
mvs*)
case $cc_basename in
@@ -7391,7 +17656,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13346,7 +13876,7 @@
+@@ -13344,7 +15747,7 @@
;;
esac
;;
@@ -7400,7 +17665,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=
-@@ -13357,15 +13887,31 @@
+@@ -13355,15 +15758,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::"'
;;
@@ -7434,7 +17699,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13375,14 +13921,14 @@
+@@ -13373,14 +15792,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7452,7 +17717,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13400,7 +13946,7 @@
+@@ -13398,7 +15817,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7461,7 +17726,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13419,13 +13965,13 @@
+@@ -13417,13 +15836,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -7477,7 +17742,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13434,17 +13980,17 @@
+@@ -13432,17 +15851,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -7499,7 +17764,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13463,7 +14009,7 @@
+@@ -13461,7 +15880,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7508,7 +17773,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13484,27 +14030,14 @@
+@@ -13482,27 +15901,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -7538,7 +17803,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13517,36 +14050,33 @@
+@@ -13515,36 +15921,33 @@
;;
solaris*)
case $cc_basename in
@@ -7587,7 +17852,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13554,9 +14084,9 @@
+@@ -13552,9 +15955,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -7599,7 +17864,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13566,9 +14096,9 @@
+@@ -13564,9 +15967,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
@@ -7611,7 +17876,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13577,9 +14107,9 @@
+@@ -13575,9 +15978,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7623,7 +17888,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13592,12 +14122,63 @@
+@@ -13590,12 +15993,63 @@
;;
esac
;;
@@ -7689,7 +17954,18 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13654,7 +14235,7 @@
+@@ -13615,8 +16069,8 @@
+ ld_shlibs_CXX=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ GCC_CXX="$GXX"
+@@ -13652,7 +16106,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.
@@ -7698,7 +17974,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13694,7 +14275,7 @@
+@@ -13692,7 +16146,7 @@
fi
;;
@@ -7707,7 +17983,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13730,6 +14311,29 @@
+@@ -13728,6 +16182,29 @@
$rm -f confest.$objext
@@ -7737,7 +18013,18 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13777,6 +14381,10 @@
+@@ -13736,8 +16213,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -13775,6 +16252,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -7748,7 +18035,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13785,7 +14393,7 @@
+@@ -13783,7 +16264,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7757,7 +18044,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13810,18 +14418,28 @@
+@@ -13808,18 +16289,28 @@
;;
chorus*)
case $cc_basename in
@@ -7789,7 +18076,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13829,22 +14447,22 @@
+@@ -13827,22 +16318,22 @@
;;
esac
;;
@@ -7818,7 +18105,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13857,9 +14475,13 @@
+@@ -13855,9 +16346,13 @@
;;
esac
;;
@@ -7833,7 +18120,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13870,18 +14492,24 @@
+@@ -13868,18 +16363,24 @@
;;
linux*)
case $cc_basename in
@@ -7861,7 +18148,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13898,25 +14526,25 @@
+@@ -13896,25 +16397,25 @@
;;
mvs*)
case $cc_basename in
@@ -7892,7 +18179,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13930,24 +14558,15 @@
+@@ -13928,24 +16429,15 @@
;;
psos*)
;;
@@ -7919,7 +18206,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13957,12 +14576,12 @@
+@@ -13955,12 +16447,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7934,7 +18221,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13972,7 +14591,7 @@
+@@ -13970,7 +16462,7 @@
;;
tandem*)
case $cc_basename in
@@ -7943,7 +18230,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13980,7 +14599,14 @@
+@@ -13978,7 +16470,14 @@
;;
esac
;;
@@ -7959,7 +18246,28 @@
;;
vxworks*)
;;
-@@ -14013,18 +14639,20 @@
+@@ -13988,16 +16487,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14011,26 +16510,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 \
@@ -7967,13 +18275,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14019: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14645: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14017: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16516: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14023: \$? = $ac_status" >&5
-+ echo "$as_me:14649: \$? = $ac_status" >&5
+- echo "$as_me:14021: \$? = $ac_status" >&5
++ echo "$as_me:16520: \$? = $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
@@ -7985,33 +18293,63 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14045,7 +14673,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+@@ -14043,7 +16544,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14055,11 +14683,53 @@
+@@ -14053,72 +16554,112 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_cv_prog_compiler_c_o_CXX=no
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+- cd conftest
+- mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+- lt_compiler_flag="-o out/conftest2.$ac_objext"
+- # Insert the option either (1) after the last *FLAGS variable, or
+- # (2) before a word containing "conftest.", or (3) at the end.
+- # Note that $ac_compile itself does not contain backslashes and begins
+- # with a dollar sign (not a hyphen), so the echo should work correctly.
+- lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8035,8 +18373,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+ :
@@ -8045,42 +18383,34 @@
+fi
+
+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
- lt_cv_prog_compiler_c_o_CXX=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
-@@ -14067,38 +14737,36 @@
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ lt_cv_prog_compiler_c_o_CXX=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
++ # Insert the option either (1) after the last *FLAGS variable, or
++ # (2) before a word containing "conftest.", or (3) at the end.
++ # Note that $ac_compile itself does not contain backslashes and begins
++ # with a dollar sign (not a hyphen), so the echo should work correctly.
++ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14086: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14749: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14090: \$? = $ac_status" >&5
-+ echo "$as_me:14753: \$? = $ac_status" >&5
+- echo "$as_me:14088: \$? = $ac_status" >&5
++ echo "$as_me:16624: \$? = $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
@@ -8104,7 +18434,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14148,7 +14816,13 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -14128,8 +16669,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -14146,22 +16687,23 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8119,8 +18488,13 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14159,11 +14833,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8131,7 +18505,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -14196,6 +14865,7 @@
+@@ -14179,8 +16721,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -14194,6 +16736,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -8139,7 +18524,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14231,7 +14901,7 @@
+@@ -14216,20 +16759,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8148,7 +18550,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14241,7 +14911,20 @@
+@@ -14239,7 +16782,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8170,7 +18572,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14306,7 +14989,7 @@
+@@ -14304,7 +16860,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8179,7 +18581,7 @@
;;
beos*)
-@@ -14315,7 +14998,7 @@
+@@ -14313,7 +16869,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8188,7 +18590,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14331,7 +15014,7 @@
+@@ -14329,7 +16885,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8197,7 +18599,7 @@
need_version=no
need_lib_prefix=no
-@@ -14343,7 +15026,8 @@
+@@ -14341,7 +16897,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8207,7 +18609,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14373,7 +15057,7 @@
+@@ -14371,7 +16928,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8216,7 +18618,7 @@
;;
esac
;;
-@@ -14396,7 +15080,7 @@
+@@ -14394,7 +16951,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8225,7 +18627,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"`
-@@ -14419,7 +15103,7 @@
+@@ -14417,7 +16974,7 @@
dynamic_linker=no
;;
@@ -8234,7 +18636,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14431,8 +15115,17 @@
+@@ -14429,8 +16986,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8254,7 +18656,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14450,14 +15143,19 @@
+@@ -14448,14 +17014,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8276,7 +18678,7 @@
esac
;;
-@@ -14477,9 +15175,9 @@
+@@ -14475,9 +17046,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8288,7 +18690,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14494,7 +15192,7 @@
+@@ -14492,7 +17063,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8297,7 +18699,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14505,7 +15203,7 @@
+@@ -14503,7 +17074,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8306,7 +18708,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14517,6 +15215,18 @@
+@@ -14515,6 +17086,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8325,7 +18727,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14567,22 +15277,19 @@
+@@ -14565,22 +17148,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8354,7 +18756,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,
-@@ -14592,6 +15299,30 @@
+@@ -14590,6 +17170,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8385,7 +18787,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14601,7 +15332,7 @@
+@@ -14599,7 +17203,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8394,7 +18796,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14629,8 +15360,13 @@
+@@ -14627,8 +17231,13 @@
openbsd*)
version_type=sunos
@@ -8409,7 +18811,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
-@@ -14650,7 +15386,7 @@
+@@ -14648,7 +17257,7 @@
os2*)
libname_spec='$name'
@@ -8418,7 +18820,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14668,13 +15404,6 @@
+@@ -14666,13 +17275,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8432,7 +18834,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14700,7 +15429,7 @@
+@@ -14698,7 +17300,7 @@
need_version=yes
;;
@@ -8441,7 +18843,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'
-@@ -14733,6 +15462,29 @@
+@@ -14731,6 +17333,29 @@
fi
;;
@@ -8471,17 +18873,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14748,12 +15500,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14742,16 +17367,21 @@
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
@@ -8491,7 +18901,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14785,1111 +15542,293 @@
+@@ -14771,8 +17401,8 @@
+ # directories.
+ hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+
+ if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+@@ -14783,1145 +17413,327 @@
enable_fast_install=needless
fi
@@ -9303,7 +19724,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15415 "configure"
+-#line 15413 "configure"
-#include "confdefs.h"
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
@@ -9432,7 +19853,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15513 "configure"
+-#line 15511 "configure"
-#include "confdefs.h"
+# Dependencies to place before the objects being linked to create a
+# shared library.
@@ -9459,7 +19880,10 @@
-# 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
@@ -9481,24 +19905,33 @@
-# endif
-# endif
-#endif
--
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
- exit (status);
-}
-EOF
@@ -9520,31 +19953,43 @@
- fi
-fi
-rm -fr conftest*
--
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
--
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
-
--
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -9821,13 +20266,46 @@
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -16005,7 +15944,10 @@
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+@@ -16003,7 +17815,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.
@@ -9839,7 +20317,7 @@
fi
-@@ -16077,16 +16019,42 @@
+@@ -16075,29 +17890,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -9881,10 +20359,21 @@
+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
-@@ -16099,7 +16067,7 @@
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -9892,7 +20381,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16107,8 +16075,10 @@
+@@ -16105,21 +17946,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -9904,17 +20393,38 @@
+ fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16121,8 +16091,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
-test "$ld_shlibs_F77" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
GCC_F77="$G77"
LD_F77="$LD"
+@@ -16128,8 +17969,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
-@@ -16169,6 +16137,11 @@
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -16167,6 +18008,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -9926,7 +20436,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16185,7 +16158,7 @@
+@@ -16183,7 +18029,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -9935,7 +20445,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16211,6 +16184,16 @@
+@@ -16209,6 +18055,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -9952,7 +20462,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16222,7 +16205,7 @@
+@@ -16220,7 +18076,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.
@@ -9961,7 +20471,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16246,12 +16229,19 @@
+@@ -16244,12 +18100,19 @@
;;
linux*)
@@ -9982,7 +20492,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16266,15 +16256,15 @@
+@@ -16264,15 +18127,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -10004,7 +20514,7 @@
;;
sunos4*)
-@@ -16283,7 +16273,7 @@
+@@ -16281,7 +18144,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10013,7 +20523,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16296,6 +16286,17 @@
+@@ -16294,6 +18157,17 @@
fi
;;
@@ -10031,7 +20541,28 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16330,18 +16331,20 @@
+@@ -16305,16 +18179,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16328,26 +18202,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 \
@@ -10039,13 +20570,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16336: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16337: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16334: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18208: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16340: \$? = $ac_status" >&5
-+ echo "$as_me:16341: \$? = $ac_status" >&5
+- echo "$as_me:16338: \$? = $ac_status" >&5
++ echo "$as_me:18212: \$? = $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
@@ -10057,25 +20588,37 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16362,7 +16365,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -16360,7 +18236,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16372,6 +16375,48 @@
+@@ -16370,8 +18246,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -10102,8 +20645,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
@@ -10112,10 +20655,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16384,38 +16429,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16382,60 +18300,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10136,13 +20681,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16441: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18312: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16407: \$? = $ac_status" >&5
-+ echo "$as_me:16445: \$? = $ac_status" >&5
+- echo "$as_me:16405: \$? = $ac_status" >&5
++ echo "$as_me:18316: \$? = $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
@@ -10166,7 +20711,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16486,6 +16529,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -16445,8 +18361,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -16484,6 +18400,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10183,7 +20767,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16496,6 +16549,10 @@
+@@ -16494,6 +18420,10 @@
with_gnu_ld=no
fi
;;
@@ -10194,7 +20778,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16506,6 +16563,27 @@
+@@ -16504,6 +18434,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10222,7 +20806,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16543,7 +16621,7 @@
+@@ -16541,7 +18492,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -10231,7 +20815,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16553,13 +16631,13 @@
+@@ -16551,13 +18502,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'
@@ -10248,7 +20832,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
-@@ -16568,23 +16646,70 @@
+@@ -16566,23 +18517,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -10325,7 +20909,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16598,13 +16723,40 @@
+@@ -16596,13 +18594,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10368,7 +20952,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16614,24 +16766,19 @@
+@@ -16612,24 +18637,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10400,7 +20984,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16643,7 +16790,7 @@
+@@ -16641,7 +18661,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -10409,7 +20993,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16665,9 +16812,21 @@
+@@ -16663,9 +18683,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
@@ -10433,7 +21017,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16684,7 +16843,7 @@
+@@ -16682,7 +18714,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -10442,7 +21026,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`
-@@ -16703,8 +16862,12 @@
+@@ -16701,8 +18733,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -10455,7 +21039,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16712,22 +16875,23 @@
+@@ -16710,44 +18746,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -10486,7 +21070,56 @@
program main
end
-@@ -16768,14 +16932,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_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
+@@ -16761,19 +18811,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10504,7 +21137,61 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16824,13 +16987,11 @@
+@@ -16782,23 +18833,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
+@@ -16812,7 +18876,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16822,13 +18888,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -10521,7 +21208,7 @@
fi
fi
;;
-@@ -16843,7 +17004,7 @@
+@@ -16841,7 +18905,7 @@
ld_shlibs_F77=no
;;
@@ -10530,7 +21217,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16853,68 +17014,68 @@
+@@ -16851,68 +18915,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -10643,7 +21330,7 @@
fi
;;
-@@ -16948,16 +17109,25 @@
+@@ -16946,16 +19010,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10672,7 +21359,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
-@@ -16971,47 +17141,62 @@
+@@ -16969,47 +19042,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -10741,25 +21428,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17025,7 +17210,7 @@
+@@ -17023,7 +19111,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10768,7 +21455,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'
-@@ -17035,7 +17220,7 @@
+@@ -17033,7 +19121,7 @@
link_all_deplibs_F77=yes
;;
@@ -10777,7 +21464,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
-@@ -17058,7 +17243,8 @@
+@@ -17056,7 +19144,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
@@ -10787,7 +21474,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17068,7 +17254,7 @@
+@@ -17066,7 +19155,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -10796,7 +21483,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17079,14 +17265,14 @@
+@@ -17077,14 +19166,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -10813,7 +21500,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'
-@@ -17098,13 +17284,13 @@
+@@ -17096,13 +19185,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -10829,7 +21516,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17112,21 +17298,15 @@
+@@ -17110,21 +19199,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -10855,7 +21542,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'
-@@ -17135,8 +17315,18 @@
+@@ -17133,8 +19216,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -10876,7 +21563,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17145,7 +17335,7 @@
+@@ -17143,7 +19236,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.
@@ -10885,7 +21572,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17193,36 +17383,45 @@
+@@ -17191,36 +19284,45 @@
fi
;;
@@ -10952,8 +21639,14 @@
;;
uts4*)
-@@ -17241,11 +17440,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17235,15 +19337,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -10964,7 +21657,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -17278,6 +17472,7 @@
+@@ -17261,8 +19358,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -17276,6 +19373,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -10972,7 +21676,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17313,7 +17508,7 @@
+@@ -17298,20 +19396,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -10981,11 +21702,13 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17323,7 +17518,20 @@
+@@ -17321,9 +19419,22 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+if test "$GCC" = yes; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -11000,10 +21723,12 @@
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
++need_lib_prefix=unknown
++hardcode_into_libs=no
-@@ -17388,7 +17596,7 @@
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+@@ -17386,7 +19497,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11012,7 +21737,7 @@
;;
beos*)
-@@ -17397,7 +17605,7 @@
+@@ -17395,7 +19506,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -11021,7 +21746,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17413,7 +17621,7 @@
+@@ -17411,7 +19522,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -11030,7 +21755,7 @@
need_version=no
need_lib_prefix=no
-@@ -17425,7 +17633,8 @@
+@@ -17423,7 +19534,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -11040,7 +21765,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17455,7 +17664,7 @@
+@@ -17453,7 +19565,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11049,7 +21774,7 @@
;;
esac
;;
-@@ -17478,7 +17687,7 @@
+@@ -17476,7 +19588,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -11058,7 +21783,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"`
-@@ -17501,7 +17710,7 @@
+@@ -17499,7 +19611,7 @@
dynamic_linker=no
;;
@@ -11067,7 +21792,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17513,8 +17722,17 @@
+@@ -17511,8 +19623,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -11087,7 +21812,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17532,14 +17750,19 @@
+@@ -17530,14 +19651,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -11109,7 +21834,7 @@
esac
;;
-@@ -17559,9 +17782,9 @@
+@@ -17557,9 +19683,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -11121,7 +21846,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17576,7 +17799,7 @@
+@@ -17574,7 +19700,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -11130,7 +21855,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17587,7 +17810,7 @@
+@@ -17585,7 +19711,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -11139,7 +21864,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17599,6 +17822,18 @@
+@@ -17597,6 +19723,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -11158,7 +21883,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17649,22 +17884,19 @@
+@@ -17647,22 +19785,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -11187,7 +21912,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,
-@@ -17674,6 +17906,30 @@
+@@ -17672,6 +19807,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11218,7 +21943,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17683,7 +17939,7 @@
+@@ -17681,7 +19840,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -11227,7 +21952,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17711,8 +17967,13 @@
+@@ -17709,8 +19868,13 @@
openbsd*)
version_type=sunos
@@ -11242,7 +21967,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
-@@ -17732,7 +17993,7 @@
+@@ -17730,7 +19894,7 @@
os2*)
libname_spec='$name'
@@ -11251,7 +21976,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17750,13 +18011,6 @@
+@@ -17748,13 +19912,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -11265,7 +21990,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17782,7 +18036,7 @@
+@@ -17780,7 +19937,7 @@
need_version=yes
;;
@@ -11274,7 +21999,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'
-@@ -17815,6 +18069,29 @@
+@@ -17813,6 +19970,29 @@
fi
;;
@@ -11304,17 +22029,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17830,12 +18107,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -17824,16 +20004,21 @@
+ dynamic_linker=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
@@ -11324,7 +22057,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17867,36 +18149,6 @@
+@@ -17853,8 +20038,8 @@
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -17865,36 +20050,6 @@
enable_fast_install=needless
fi
@@ -11361,7 +22105,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17911,7 +18163,8 @@
+@@ -17909,7 +20064,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.
@@ -11371,7 +22115,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 \
-@@ -18011,6 +18264,12 @@
+@@ -18009,6 +20165,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11384,7 +22128,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18022,6 +18281,9 @@
+@@ -18020,6 +20182,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -11394,7 +22138,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18041,7 +18303,7 @@
+@@ -18039,7 +20204,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -11403,7 +22147,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18072,7 +18334,7 @@
+@@ -18070,7 +20235,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -11412,7 +22156,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18087,7 +18349,7 @@
+@@ -18085,7 +20250,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -11421,7 +22165,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18289,7 +18551,10 @@
+@@ -18287,7 +20452,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.
@@ -11433,7 +22177,15 @@
fi
-@@ -18322,26 +18587,55 @@
+@@ -18308,7 +20476,6 @@
+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+
+
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+
+@@ -18320,26 +20487,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -11490,7 +22242,18 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18368,18 +18662,20 @@
+@@ -18351,8 +20547,8 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18366,26 +20562,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 \
@@ -11498,13 +22261,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18374: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18668: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18372: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18378: \$? = $ac_status" >&5
-+ echo "$as_me:18672: \$? = $ac_status" >&5
+- echo "$as_me:18376: \$? = $ac_status" >&5
++ echo "$as_me:20572: \$? = $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
@@ -11516,7 +22279,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18440,6 +18736,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+@@ -18399,8 +20597,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18438,6 +20636,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -11528,7 +22312,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18456,7 +18757,7 @@
+@@ -18454,7 +20657,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11537,7 +22321,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18482,6 +18783,16 @@
+@@ -18480,6 +20683,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11554,7 +22338,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18493,7 +18804,7 @@
+@@ -18491,7 +20704,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.
@@ -11563,7 +22347,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18517,12 +18828,19 @@
+@@ -18515,12 +20728,19 @@
;;
linux*)
@@ -11584,7 +22368,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18537,15 +18855,15 @@
+@@ -18535,15 +20755,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -11606,7 +22390,7 @@
;;
sunos4*)
-@@ -18554,7 +18872,7 @@
+@@ -18552,7 +20772,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -11615,7 +22399,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18567,6 +18885,17 @@
+@@ -18565,6 +20785,17 @@
fi
;;
@@ -11633,7 +22417,28 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18601,18 +18930,20 @@
+@@ -18576,16 +20807,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18599,26 +20830,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 \
@@ -11641,13 +22446,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18607: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18936: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18605: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20836: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18611: \$? = $ac_status" >&5
-+ echo "$as_me:18940: \$? = $ac_status" >&5
+- echo "$as_me:18609: \$? = $ac_status" >&5
++ echo "$as_me:20840: \$? = $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
@@ -11659,25 +22464,37 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18633,7 +18964,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -18631,7 +20864,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18643,6 +18974,48 @@
+@@ -18641,8 +20874,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -11704,8 +22521,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+ :
@@ -11714,10 +22531,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18655,38 +19028,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18653,60 +20928,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -11738,13 +22557,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19040: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18672: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20940: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18678: \$? = $ac_status" >&5
-+ echo "$as_me:19044: \$? = $ac_status" >&5
+- echo "$as_me:18676: \$? = $ac_status" >&5
++ echo "$as_me:20944: \$? = $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
@@ -11768,7 +22587,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18757,6 +19128,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -18716,8 +20989,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -18755,6 +21028,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -11785,7 +22643,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18767,6 +19148,10 @@
+@@ -18765,6 +21048,10 @@
with_gnu_ld=no
fi
;;
@@ -11796,7 +22654,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18777,6 +19162,27 @@
+@@ -18775,6 +21062,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11824,7 +22682,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18814,7 +19220,7 @@
+@@ -18812,7 +21120,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -11833,7 +22691,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18824,13 +19230,13 @@
+@@ -18822,13 +21130,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'
@@ -11850,7 +22708,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
-@@ -18839,23 +19245,70 @@
+@@ -18837,23 +21145,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -11927,7 +22785,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18869,13 +19322,40 @@
+@@ -18867,13 +21222,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11970,7 +22828,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18885,24 +19365,19 @@
+@@ -18883,24 +21265,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12002,7 +22860,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18914,7 +19389,7 @@
+@@ -18912,7 +21289,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -12011,7 +22869,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18936,9 +19411,21 @@
+@@ -18934,9 +21311,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
@@ -12035,7 +22893,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18955,7 +19442,7 @@
+@@ -18953,7 +21342,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -12044,7 +22902,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`
-@@ -18974,8 +19461,12 @@
+@@ -18972,8 +21361,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -12057,7 +22915,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18983,22 +19474,23 @@
+@@ -18981,22 +21374,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12088,7 +22946,58 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19049,14 +19541,13 @@
+@@ -19012,23 +21406,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
+@@ -19042,19 +21449,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12106,7 +23015,61 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19115,13 +19606,11 @@
+@@ -19073,23 +21481,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -19103,7 +21524,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19113,13 +21536,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12123,7 +23086,7 @@
fi
fi
;;
-@@ -19134,7 +19623,7 @@
+@@ -19132,7 +21553,7 @@
ld_shlibs_GCJ=no
;;
@@ -12132,7 +23095,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19144,68 +19633,68 @@
+@@ -19142,68 +21563,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -12245,7 +23208,7 @@
fi
;;
-@@ -19239,16 +19728,25 @@
+@@ -19237,16 +21658,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12253,20 +23216,20 @@
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ freebsd* | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ ;;
++
++ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++ kfreebsd*-gnu)
++ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
++ link_all_deplibs_GCJ=no
;;
-+ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-+ kfreebsd*-gnu)
-+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ link_all_deplibs_GCJ=no
-+ ;;
-+
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -12274,7 +23237,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
-@@ -19262,47 +19760,62 @@
+@@ -19260,47 +21690,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -12361,7 +23324,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19316,7 +19829,7 @@
+@@ -19314,7 +21759,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12370,7 +23333,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'
-@@ -19326,7 +19839,7 @@
+@@ -19324,7 +21769,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -12379,7 +23342,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
-@@ -19349,7 +19862,8 @@
+@@ -19347,7 +21792,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
@@ -12389,7 +23352,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19359,7 +19873,7 @@
+@@ -19357,7 +21803,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -12398,7 +23361,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19370,14 +19884,14 @@
+@@ -19368,14 +21814,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -12415,7 +23378,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'
-@@ -19389,13 +19903,13 @@
+@@ -19387,13 +21833,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -12431,7 +23394,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19403,21 +19917,15 @@
+@@ -19401,21 +21847,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -12457,7 +23420,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'
-@@ -19426,8 +19934,18 @@
+@@ -19424,8 +21864,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12478,7 +23441,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19436,7 +19954,7 @@
+@@ -19434,7 +21884,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.
@@ -12487,7 +23450,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19484,36 +20002,45 @@
+@@ -19482,36 +21932,45 @@
fi
;;
@@ -12554,8 +23517,14 @@
;;
uts4*)
-@@ -19532,11 +20059,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19526,15 +21985,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12566,7 +23535,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -19569,6 +20091,7 @@
+@@ -19552,8 +22006,8 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -19567,6 +22021,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -12574,7 +23554,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19604,7 +20127,7 @@
+@@ -19589,20 +22044,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -12583,7 +23580,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19614,7 +20137,20 @@
+@@ -19612,7 +22067,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -12605,7 +23602,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19679,7 +20215,7 @@
+@@ -19677,7 +22145,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -12614,7 +23611,7 @@
;;
beos*)
-@@ -19688,7 +20224,7 @@
+@@ -19686,7 +22154,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -12623,7 +23620,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19704,7 +20240,7 @@
+@@ -19702,7 +22170,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -12632,7 +23629,7 @@
need_version=no
need_lib_prefix=no
-@@ -19716,7 +20252,8 @@
+@@ -19714,7 +22182,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -12642,7 +23639,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19746,7 +20283,7 @@
+@@ -19744,7 +22213,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -12651,7 +23648,7 @@
;;
esac
;;
-@@ -19769,7 +20306,7 @@
+@@ -19767,7 +22236,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -12660,7 +23657,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"`
-@@ -19792,7 +20329,7 @@
+@@ -19790,7 +22259,7 @@
dynamic_linker=no
;;
@@ -12669,7 +23666,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19804,8 +20341,17 @@
+@@ -19802,8 +22271,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -12689,7 +23686,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19823,14 +20369,19 @@
+@@ -19821,14 +22299,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -12711,7 +23708,7 @@
esac
;;
-@@ -19850,9 +20401,9 @@
+@@ -19848,9 +22331,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -12723,7 +23720,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19867,7 +20418,7 @@
+@@ -19865,7 +22348,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -12732,7 +23729,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19878,7 +20429,7 @@
+@@ -19876,7 +22359,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -12741,7 +23738,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19890,6 +20441,18 @@
+@@ -19888,6 +22371,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -12760,7 +23757,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19940,22 +20503,19 @@
+@@ -19938,22 +22433,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -12789,7 +23786,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,
-@@ -19965,6 +20525,30 @@
+@@ -19963,6 +22455,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -12820,7 +23817,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19974,7 +20558,7 @@
+@@ -19972,7 +22488,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -12829,7 +23826,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -20002,8 +20586,13 @@
+@@ -20000,8 +22516,13 @@
openbsd*)
version_type=sunos
@@ -12844,7 +23841,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
-@@ -20023,7 +20612,7 @@
+@@ -20021,7 +22542,7 @@
os2*)
libname_spec='$name'
@@ -12853,7 +23850,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20041,13 +20630,6 @@
+@@ -20039,13 +22560,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -12867,7 +23864,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20073,7 +20655,7 @@
+@@ -20071,7 +22585,7 @@
need_version=yes
;;
@@ -12876,7 +23873,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'
-@@ -20106,6 +20688,29 @@
+@@ -20104,6 +22618,29 @@
fi
;;
@@ -12906,30 +23903,54 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -20121,12 +20726,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
- test "$dynamic_linker" = no && can_build_shared=no
+@@ -20112,876 +22649,53 @@
+ ;;
-+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" || \
+ *)
+- 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: 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
-+ test -n "$runpath_var_GCJ" || \
-+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
-@@ -20158,90 +20768,21842 @@
- enable_fast_install=needless
- fi
-
+-
+- # 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
+-
+-if test "$hardcode_action_GCJ" = relink; then
+- # Fast installation is not supported
+- enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+- test "$enable_shared" = no; then
+- # Fast installation is not necessary
+- enable_fast_install=needless
+-fi
+-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -12999,7 +24020,7 @@
-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"
@@ -13014,21948 +24035,82 @@
- ;
- return 0;
-}
-+# 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
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # 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.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
-+ 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 \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_GCJ \
-+ CC_GCJ \
-+ LD_GCJ \
-+ lt_prog_compiler_wl_GCJ \
-+ lt_prog_compiler_pic_GCJ \
-+ lt_prog_compiler_static_GCJ \
-+ lt_prog_compiler_no_builtin_flag_GCJ \
-+ export_dynamic_flag_spec_GCJ \
-+ thread_safe_flag_spec_GCJ \
-+ whole_archive_flag_spec_GCJ \
-+ enable_shared_with_static_runtimes_GCJ \
-+ old_archive_cmds_GCJ \
-+ old_archive_from_new_cmds_GCJ \
-+ predep_objects_GCJ \
-+ postdep_objects_GCJ \
-+ predeps_GCJ \
-+ postdeps_GCJ \
-+ compiler_lib_search_path_GCJ \
-+ archive_cmds_GCJ \
-+ archive_expsym_cmds_GCJ \
-+ postinstall_cmds_GCJ \
-+ postuninstall_cmds_GCJ \
-+ old_archive_from_expsyms_cmds_GCJ \
-+ allow_undefined_flag_GCJ \
-+ no_undefined_flag_GCJ \
-+ export_symbols_cmds_GCJ \
-+ hardcode_libdir_flag_spec_GCJ \
-+ hardcode_libdir_flag_spec_ld_GCJ \
-+ hardcode_libdir_separator_GCJ \
-+ hardcode_automatic_GCJ \
-+ module_cmds_GCJ \
-+ module_expsym_cmds_GCJ \
-+ lt_cv_prog_compiler_c_o_GCJ \
-+ exclude_expsyms_GCJ \
-+ include_expsyms_GCJ; do
-+
-+ case $var in
-+ old_archive_cmds_GCJ | \
-+ old_archive_from_new_cmds_GCJ | \
-+ archive_cmds_GCJ | \
-+ archive_expsym_cmds_GCJ | \
-+ module_cmds_GCJ | \
-+ module_expsym_cmds_GCJ | \
-+ old_archive_from_expsyms_cmds_GCJ | \
-+ export_symbols_cmds_GCJ | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_GCJ
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_GCJ
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_GCJ
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# 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_GCJ
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_GCJ
-+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_GCJ
-+
-+# 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_GCJ
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+
-+# 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_GCJ
-+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_GCJ
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_GCJ
-+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-+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_GCJ
-+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+
-+# 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_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_GCJ
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_GCJ
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+
-+# 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_GCJ
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_GCJ
-+
-+# 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
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_GCJ
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_GCJ
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_GCJ
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_GCJ
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_GCJ
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_GCJ"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_GCJ
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_GCJ
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_GCJ
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # 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.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ RC)
-+
-+
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+objext_RC=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+compiler_RC=$CC
-+for cc_temp in $compiler""; do
-+ case $cc_temp in
-+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+ \-*) ;;
-+ *) break;;
-+ esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+lt_cv_prog_compiler_c_o_RC=yes
-+
-+# 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
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # 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.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
-+ 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 \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_RC \
-+ CC_RC \
-+ LD_RC \
-+ lt_prog_compiler_wl_RC \
-+ lt_prog_compiler_pic_RC \
-+ lt_prog_compiler_static_RC \
-+ lt_prog_compiler_no_builtin_flag_RC \
-+ export_dynamic_flag_spec_RC \
-+ thread_safe_flag_spec_RC \
-+ whole_archive_flag_spec_RC \
-+ enable_shared_with_static_runtimes_RC \
-+ old_archive_cmds_RC \
-+ old_archive_from_new_cmds_RC \
-+ predep_objects_RC \
-+ postdep_objects_RC \
-+ predeps_RC \
-+ postdeps_RC \
-+ compiler_lib_search_path_RC \
-+ archive_cmds_RC \
-+ archive_expsym_cmds_RC \
-+ postinstall_cmds_RC \
-+ postuninstall_cmds_RC \
-+ old_archive_from_expsyms_cmds_RC \
-+ allow_undefined_flag_RC \
-+ no_undefined_flag_RC \
-+ export_symbols_cmds_RC \
-+ hardcode_libdir_flag_spec_RC \
-+ hardcode_libdir_flag_spec_ld_RC \
-+ hardcode_libdir_separator_RC \
-+ hardcode_automatic_RC \
-+ module_cmds_RC \
-+ module_expsym_cmds_RC \
-+ lt_cv_prog_compiler_c_o_RC \
-+ exclude_expsyms_RC \
-+ include_expsyms_RC; do
-+
-+ case $var in
-+ old_archive_cmds_RC | \
-+ old_archive_from_new_cmds_RC | \
-+ archive_cmds_RC | \
-+ archive_expsym_cmds_RC | \
-+ module_cmds_RC | \
-+ module_expsym_cmds_RC | \
-+ old_archive_from_expsyms_cmds_RC | \
-+ export_symbols_cmds_RC | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_RC
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_RC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_RC
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_RC
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# 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_RC
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_RC
-+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_RC
-+
-+# 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_RC
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+
-+# 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_RC
-+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_RC
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_RC
-+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-+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_RC
-+module_expsym_cmds=$lt_module_expsym_cmds_RC
-+
-+# 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_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_RC
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_RC
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-+
-+# 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_RC
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_RC
-+
-+# 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
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_RC
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_RC
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_RC
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_RC
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_RC
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_RC"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_RC
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_RC
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_RC
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_RC
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # 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.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+ ;;
-+
-+ *)
-+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+
-+ # Append the new tag name to the list of available tags.
-+ if test -n "$tagname" ; then
-+ available_tags="$available_tags $tagname"
-+ fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ # Now substitute the updated list of available tags.
-+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
-+ else
-+ rm -f "${ofile}T"
-+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-+
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+# Prevent multiple expansion
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+LIBTOOL_SHELL="/bin/sh ./libtool"
-+# LIBTOOL="$LIBTOOL --silent"
-+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-+
-+
-+# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
-+KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-+
-+
-+# we patch configure quite some so we better keep that consistent for incremental runs
-+AUTOCONF='$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure'
-+
-+
-+
-+
-+
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_MSGFMT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case "$MSGFMT" in
-+ /*)
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in $PATH; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"; then
-+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-+ ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test -n "$MSGFMT"; then
-+ echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $GMSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+ ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+
-+if test -n "$GMSGFMT"; then
-+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+
-+ if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-+ echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-+ GMSGFMT=":"
-+ fi
-+ MSGFMT=$GMSGFMT
-+
-+
-+
-+ # Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case "$XGETTEXT" in
-+ /*)
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in $PATH; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+ ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test -n "$XGETTEXT"; then
-+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+
-+ if test "$XGETTEXT" != ":"; then
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
-+ XGETTEXT=":"
-+ fi
-+ fi
-+
-+
-+
-+
-+
-+if test -z "3.3"; then
-+ # Current default Qt version: 3.3
-+ kde_qtver=3
-+ kde_qtsubver=3
-+else
-+ kde_qtsubver=`echo "3.3" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-+ # following is the check if subversion isnt found in passed argument
-+ if test "$kde_qtsubver" = "3.3"; then
-+ kde_qtsubver=1
-+ fi
-+ kde_qtver=`echo "3.3" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-+ if test "$kde_qtver" = "1"; then
-+ kde_qtsubver=42
-+ fi
-+fi
-+
-+if test -z ""; then
-+ if test "$kde_qtver" = "2"; then
-+ if test $kde_qtsubver -gt 0; then
-+ kde_qt_minversion=">= Qt 2.2.2"
-+ else
-+ kde_qt_minversion=">= Qt 2.0.2"
-+ fi
-+ fi
-+ if test "$kde_qtver" = "3"; then
-+ if test $kde_qtsubver -gt 0; then
-+ if test $kde_qtsubver -gt 1; then
-+ if test $kde_qtsubver -gt 2; then
-+ kde_qt_minversion=">= Qt 3.3 and < 4.0"
-+ else
-+ kde_qt_minversion=">= Qt 3.2 and < 4.0"
-+ fi
-+ else
-+ kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
-+ fi
-+ else
-+ kde_qt_minversion=">= Qt 3.0 and < 4.0"
-+ fi
-+ fi
-+ if test "$kde_qtver" = "1"; then
-+ kde_qt_minversion=">= 1.42 and < 2.0"
-+ fi
-+else
-+ kde_qt_minversion=""
-+fi
-+
-+if test -z ""; then
-+ if test $kde_qtver = 3; then
-+ if test $kde_qtsubver -gt 0; then
-+ kde_qt_verstring="QT_VERSION >= 0x03 at VER@00 && QT_VERSION < 0x040000"
-+ qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-+ kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s, at VER@,$qtsubver,"`
-+ else
-+ kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
-+ fi
-+ fi
-+ if test $kde_qtver = 2; then
-+ if test $kde_qtsubver -gt 0; then
-+ kde_qt_verstring="QT_VERSION >= 222"
-+ else
-+ kde_qt_verstring="QT_VERSION >= 200"
-+ fi
-+ fi
-+ if test $kde_qtver = 1; then
-+ kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-+ fi
-+else
-+ kde_qt_verstring=""
-+fi
-+
-+if test $kde_qtver = 4; then
-+ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-+fi
-+if test $kde_qtver = 3; then
-+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-+fi
-+if test $kde_qtver = 2; then
-+ kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-+fi
-+if test $kde_qtver = 1; then
-+ kde_qt_dirs="$QTDIR /usr/lib/qt"
-+fi
-+
-+
-+
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+
-+ echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-+echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
-+ if test "${kde_cv_stl_works+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. */
-+
-+#include <string>
-+using namespace std;
-+
-+int
-+main ()
-+{
-+
-+ string astring="Hallo Welt.";
-+ astring.erase(0, 6); // now astring is "Welt"
-+ return 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ kde_cv_stl_works=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_stl_works=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+
-+
-+ echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-+echo "${ECHO_T}$kde_cv_stl_works" >&6
-+
-+ if test "$kde_cv_stl_works" = "yes"; then
-+ # back compatible
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SGI_STL 1
-+_ACEOF
-+
-+ else
-+ { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev." >&5
-+echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for strlcat" >&5
-+echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
-+if test "${kde_cv_func_strlcat+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <string.h>
-+
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+ buf[0]='\0';
-+ strlcat(buf, "KDE function test", sizeof(buf));
-+
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ kde_cv_func_strlcat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_func_strlcat=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcat" >&6
-+
-+echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
-+if test "${kde_cv_proto_strlcat+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_strlcat" = xyes; then
-+ kde_cv_proto_strlcat=no
-+else
-+ case "strlcat" in
-+ setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+ kde_cv_proto_strlcat="yes - in libkdefakes"
-+ ;;
-+ *)
-+ kde_cv_proto_strlcat=unknown
-+ ;;
-+ esac
-+fi
-+
-+if test "x$kde_cv_proto_strlcat" = xunknown; then
-+
-+
-+
-+ 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'
-+
-+
-+ kde_safe_libs=$LIBS
-+ LIBS="$LIBS $X_EXTRA_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <string.h>
-+
-+
-+extern "C" unsigned long strlcat(char*, const char*, unsigned long);
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+ buf[0]='\0';
-+ strlcat(buf, "KDE function test", sizeof(buf));
-+
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_func_strlcat=yes
-+ kde_cv_proto_strlcat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_proto_strlcat="strlcat unavailable"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
-+echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
-+
-+if test "x$kde_cv_func_strlcat" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCAT 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_strlcat" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCAT_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for strlcpy" >&5
-+echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
-+if test "${kde_cv_func_strlcpy+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <string.h>
-+
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+ strlcpy(buf, "KDE function test", sizeof(buf));
-+
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ kde_cv_func_strlcpy=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_func_strlcpy=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
-+
-+echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
-+if test "${kde_cv_proto_strlcpy+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_strlcpy" = xyes; then
-+ kde_cv_proto_strlcpy=no
-+else
-+ case "strlcpy" in
-+ setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+ kde_cv_proto_strlcpy="yes - in libkdefakes"
-+ ;;
-+ *)
-+ kde_cv_proto_strlcpy=unknown
-+ ;;
-+ esac
-+fi
-+
-+if test "x$kde_cv_proto_strlcpy" = xunknown; then
-+
-+
-+
-+ 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'
-+
-+
-+ kde_safe_libs=$LIBS
-+ LIBS="$LIBS $X_EXTRA_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <string.h>
-+
-+
-+extern "C" unsigned long strlcpy(char*, const char*, unsigned long);
-+
-+int
-+main ()
-+{
-+
-+ char buf[20];
-+ strlcpy(buf, "KDE function test", sizeof(buf));
-+
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_func_strlcpy=yes
-+ kde_cv_proto_strlcpy=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_proto_strlcpy="strlcpy unavailable"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
-+echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
-+
-+if test "x$kde_cv_func_strlcpy" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCPY 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_strlcpy" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRLCPY_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for main in -lutil" >&5
-+echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
-+if test "${ac_cv_lib_util_main+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+int
-+main ()
-+{
-+main ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_util_main=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_util_main=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_main" >&6
-+if test $ac_cv_lib_util_main = yes; then
-+ LIBUTIL="-lutil"
-+fi
-+
-+ echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-+echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
-+if test "${ac_cv_lib_compat_main+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcompat $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+int
-+main ()
-+{
-+main ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_compat_main=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_compat_main=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
-+if test $ac_cv_lib_compat_main = yes; then
-+ LIBCOMPAT="-lcompat"
-+fi
-+
-+ kde_have_crypt=
-+ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt $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 crypt ();
-+int
-+main ()
-+{
-+crypt ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_crypt_crypt=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_crypt_crypt=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+ LIBCRYPT="-lcrypt"; kde_have_crypt=yes
-+else
-+ echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-+echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
-+if test "${ac_cv_lib_c_crypt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lc $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 crypt ();
-+int
-+main ()
-+{
-+crypt ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_c_crypt=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_c_crypt=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
-+if test $ac_cv_lib_c_crypt = yes; then
-+ kde_have_crypt=yes
-+else
-+
-+ { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support" >&5
-+echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support" >&2;}
-+ kde_have_crypt=no
-+
-+fi
-+
-+fi
-+
-+
-+ if test $kde_have_crypt = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_CRYPT 1
-+_ACEOF
-+
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+ if test "${kde_cv_socklen_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_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
-+
-+ kde_cv_socklen_t=no
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+
-+ socklen_t len;
-+ getpeername(0,0,&len);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+
-+ kde_cv_socklen_t=yes
-+ kde_cv_socklen_t_equiv=socklen_t
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+ echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t" >&6
-+ if test $kde_cv_socklen_t = no; then
-+ echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-+echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
-+ if test "${kde_cv_socklen_t_equiv+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_socklen_t_equiv=int
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_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
-+
-+ for t in int size_t unsigned long "unsigned long"; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+
-+int
-+main ()
-+{
-+
-+ $t len;
-+ getpeername(0,0,&len);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+
-+ kde_cv_socklen_t_equiv="$t"
-+ 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_ext
-+ done
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+ echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
-+ fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define kde_socklen_t $kde_cv_socklen_t_equiv
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ksize_t $kde_cv_socklen_t_equiv
-+_ACEOF
-+
-+
-+ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet $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 dnet_ntoa ();
-+int
-+main ()
-+{
-+dnet_ntoa ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_dnet_dnet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_dnet_ntoa=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+fi
-+
-+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet_stub $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 dnet_ntoa ();
-+int
-+main ()
-+{
-+dnet_ntoa ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_dnet_stub_dnet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+fi
-+
-+ fi
-+ echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-+echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
-+if test "${ac_cv_func_inet_ntoa+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. */
-+/* Define inet_ntoa to an innocuous variant, in case <limits.h> declares inet_ntoa.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define inet_ntoa innocuous_inet_ntoa
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char inet_ntoa (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef inet_ntoa
-+
-+/* 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 inet_ntoa ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
-+choke me
-+#else
-+char (*f) () = inet_ntoa;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != inet_ntoa;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func_inet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_inet_ntoa=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
-+
-+ if test $ac_cv_func_inet_ntoa = no; then
-+ echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
-+if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $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 inet_ntoa ();
-+int
-+main ()
-+{
-+inet_ntoa ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_nsl_inet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_nsl_inet_ntoa=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
-+if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-+fi
-+
-+ fi
-+ echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+if test "${ac_cv_func_connect+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. */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define connect innocuous_connect
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char connect (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef connect
-+
-+/* 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 connect ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_connect) || defined (__stub___connect)
-+choke me
-+#else
-+char (*f) () = connect;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != connect;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func_connect=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_connect=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6
-+
-+ if test $ac_cv_func_connect = no; then
-+ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $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 connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_socket_connect=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_connect=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+if test $ac_cv_lib_socket_connect = yes; then
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+fi
-+
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+if test "${ac_cv_func_remove+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. */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define remove innocuous_remove
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char remove (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef remove
-+
-+/* 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 remove ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_remove) || defined (__stub___remove)
-+choke me
-+#else
-+char (*f) () = remove;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != remove;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func_remove=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_remove=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6
-+
-+ if test $ac_cv_func_remove = no; then
-+ echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+if test "${ac_cv_lib_posix_remove+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix $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 remove ();
-+int
-+main ()
-+{
-+remove ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_posix_remove=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_posix_remove=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+if test $ac_cv_lib_posix_remove = yes; then
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+fi
-+
-+ fi
-+
-+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+ echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+if test "${ac_cv_func_shmat+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. */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shmat innocuous_shmat
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char shmat (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shmat
-+
-+/* 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 shmat ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_shmat) || defined (__stub___shmat)
-+choke me
-+#else
-+char (*f) () = shmat;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != shmat;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func_shmat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_shmat=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+if test $ac_cv_func_shmat = yes; then
-+ :
-+else
-+ echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc $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 shmat ();
-+int
-+main ()
-+{
-+shmat ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_ipc_shmat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ipc_shmat=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+if test $ac_cv_lib_ipc_shmat = yes; then
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+fi
-+
-+fi
-+
-+
-+ # more headers that need to be explicitly included on darwin
-+
-+
-+for ac_header in sys/types.h stdint.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+ # sys/bitypes.h is needed for uint32_t and friends on Tru64
-+
-+for ac_header in sys/bitypes.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+ # darwin requires a poll emulation library
-+ echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-+echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
-+if test "${ac_cv_lib_poll_poll+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpoll $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 poll ();
-+int
-+main ()
-+{
-+poll ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_poll_poll=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_poll_poll=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-+echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
-+if test $ac_cv_lib_poll_poll = yes; then
-+ LIB_POLL="-lpoll"
-+fi
-+
-+
-+ # for some image handling on Mac OS X
-+
-+for ac_header in Carbon/Carbon.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+ # CoreAudio framework
-+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+
-+fi
-+if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_COREAUDIO 1
-+_ACEOF
-+
-+ FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
-+
-+fi
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-+echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
-+ kde_libs_safe="$LIBS"
-+ LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+int
-+main ()
-+{
-+
-+ res_init();
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+
-+ LIBRESOLV="-lresolv"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT 1
-+_ACEOF
-+
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$kde_libs_safe
-+
-+
-+
-+echo "$as_me:$LINENO: checking for res_init" >&5
-+echo $ECHO_N "checking for res_init... $ECHO_C" >&6
-+if test "${kde_cv_func_res_init+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'
-+
-+
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+
-+int
-+main ()
-+{
-+
-+res_init()
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ kde_cv_func_res_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_func_res_init=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-+echo "${ECHO_T}$kde_cv_func_res_init" >&6
-+
-+echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-+echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
-+if test "${kde_cv_proto_res_init+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "x$kde_cv_func_res_init" = xyes; then
-+ kde_cv_proto_res_init=no
-+else
-+ case "res_init" in
-+ setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+ kde_cv_proto_res_init="yes - in libkdefakes"
-+ ;;
-+ *)
-+ kde_cv_proto_res_init=unknown
-+ ;;
-+ esac
-+fi
-+
-+if test "x$kde_cv_proto_res_init" = xunknown; then
-+
-+
-+
-+ 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'
-+
-+
-+ kde_safe_libs=$LIBS
-+ LIBS="$LIBS $X_EXTRA_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+
-+
-+extern "C" int res_init(void);
-+
-+int
-+main ()
-+{
-+
-+res_init()
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_func_res_init=yes
-+ kde_cv_proto_res_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_proto_res_init="res_init unavailable"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$kde_safe_libs
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
-+echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-+echo "${ECHO_T}$kde_cv_proto_res_init" >&6
-+
-+if test "x$kde_cv_func_res_init" = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT 1
-+_ACEOF
-+
-+
-+fi
-+if test "x$kde_cv_proto_res_init" = xno; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RES_INIT_PROTO 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+ LIBSOCKET="$X_EXTRA_LIBS"
-+
-+
-+ echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-+echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
-+if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lucb $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 killpg ();
-+int
-+main ()
-+{
-+killpg ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_ucb_killpg=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ucb_killpg=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
-+if test $ac_cv_lib_ucb_killpg = yes; then
-+ LIBUCB="-lucb"
-+fi
-+
-+
-+ case $host in *-*-lynxos* )
-+ echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-+echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
-+ CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-+ echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6
-+ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd $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 gethostbyname ();
-+int
-+main ()
-+{
-+gethostbyname ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_bsd_gethostbyname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_bsd_gethostbyname=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+if test $ac_cv_lib_bsd_gethostbyname = yes; then
-+ LIBSOCKET="-lbsd"
-+fi
-+ ;;
-+ esac
-+
-+ echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6
-+if test "${ac_cv_type_int+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. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((int *) 0)
-+ return 0;
-+if (sizeof (int))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_int=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_int=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6
-+
-+echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_int" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_int=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (int)); }
-+unsigned long ulongval () { return (long) (sizeof (int)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (int))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (int))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (int))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_int=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_int=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6
-+if test "${ac_cv_type_short+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. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((short *) 0)
-+ return 0;
-+if (sizeof (short))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_short=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_short=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6
-+
-+echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_short" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_short=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (short)); }
-+unsigned long ulongval () { return (long) (sizeof (short)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (short))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (short))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (short))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_short=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_short=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6
-+if test "${ac_cv_type_long+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. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((long *) 0)
-+ return 0;
-+if (sizeof (long))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_long=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_long=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6
-+
-+echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_long" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (long)); }
-+unsigned long ulongval () { return (long) (sizeof (long)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (long))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (long))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (long))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_long=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_long=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: checking for char *" >&5
-+echo $ECHO_N "checking for char *... $ECHO_C" >&6
-+if test "${ac_cv_type_char_p+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. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((char * *) 0)
-+ return 0;
-+if (sizeof (char *))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_char_p=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_char_p=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-+echo "${ECHO_T}$ac_cv_type_char_p" >&6
-+
-+echo "$as_me:$LINENO: checking size of char *" >&5
-+echo $ECHO_N "checking size of char *... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_char_p+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_char_p" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_char_p=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (char *)); }
-+unsigned long ulongval () { return (long) (sizeof (char *)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (char *))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (char *))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (char *))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_char_p=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (char *), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_char_p=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-+_ACEOF
-+
-+
-+
-+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $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 dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+
-+LIBDL="-ldl"
-+ac_cv_have_dlfcn=yes
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-+echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $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 shl_unload ();
-+int
-+main ()
-+{
-+shl_unload ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_dld_shl_unload=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_shl_unload=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
-+if test $ac_cv_lib_dld_shl_unload = yes; then
-+
-+LIBDL="-ldld"
-+ac_cv_have_shload=yes
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+if test "${ac_cv_type_size_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((size_t *) 0)
-+ return 0;
-+if (sizeof (size_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_size_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_size_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+
-+echo "$as_me:$LINENO: checking size of size_t" >&5
-+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_size_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_size_t" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_size_t=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (size_t)); }
-+unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (size_t))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (size_t))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (size_t))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_size_t=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (size_t), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_size_t=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-+_ACEOF
-+
-+
-+ echo "$as_me:$LINENO: checking for unsigned long" >&5
-+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-+if test "${ac_cv_type_unsigned_long+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. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((unsigned long *) 0)
-+ return 0;
-+if (sizeof (unsigned long))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_unsigned_long=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_unsigned_long=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-+
-+echo "$as_me:$LINENO: checking size of unsigned long" >&5
-+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$ac_cv_type_unsigned_long" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (unsigned long)); }
-+unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ exit (1);
-+ if (((long) (sizeof (unsigned long))) < 0)
-+ {
-+ long i = longval ();
-+ if (i != ((long) (sizeof (unsigned long))))
-+ exit (1);
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (unsigned long))))
-+ exit (1);
-+ fprintf (f, "%lu\n", i);
-+ }
-+ exit (ferror (f) || fclose (f) != 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sizeof_unsigned_long=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+ ac_cv_sizeof_unsigned_long=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-+_ACEOF
-+
-+
-+
-+ echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-+echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-+ choke me
-+ #endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { { echo "$as_me:$LINENO: 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!
-+ " >&5
-+echo "$as_me: 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!
-+ " >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+ echo "$as_me:$LINENO: checking for PIE support" >&5
-+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
-+if test "${kde_cv_val_pie_support+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'
-+
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIE"
-+ LDFLAGS="$LDFLAGS -pie"
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+int foo;
-+int
-+main ()
-+{
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_val_pie_support=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_val_pie_support=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-+echo "${ECHO_T}$kde_cv_val_pie_support" >&6
-+
-+ echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-+echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
-+
-+ # Check whether --enable-pie or --disable-pie was given.
-+if test "${enable_pie+set}" = set; then
-+ enableval="$enable_pie"
-+ kde_has_pie_support=$enableval
-+else
-+ kde_has_pie_support=detect
-+fi;
-+
-+ if test "$kde_has_pie_support" = "detect"; then
-+ kde_has_pie_support=$kde_cv_val_pie_support
-+ fi
-+
-+ echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-+echo "${ECHO_T}$kde_has_pie_support" >&6
-+
-+ KDE_USE_FPIE=""
-+ KDE_USE_PIE=""
-+
-+
-+
-+
-+ if test "$kde_has_pie_support" = "yes"; then
-+ KDE_USE_FPIE="-fPIE"
-+ KDE_USE_PIE="-pie"
-+ fi
-+
-+
-+# darwin needs this to initialize the environment
-+
-+for ac_header in crt_externs.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-+echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
-+if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define _NSGetEnviron to an innocuous variant, in case <limits.h> declares _NSGetEnviron.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define _NSGetEnviron innocuous__NSGetEnviron
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char _NSGetEnviron (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _NSGetEnviron
-+
-+/* 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 _NSGetEnviron ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
-+choke me
-+#else
-+char (*f) () = _NSGetEnviron;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != _NSGetEnviron;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func__NSGetEnviron=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func__NSGetEnviron=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-+echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
-+if test $ac_cv_func__NSGetEnviron = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_NSGETENVIRON 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in vsnprintf snprintf
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $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. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check whether --enable-embedded or --disable-embedded was given.
-+if test "${enable_embedded+set}" = set; then
-+ enableval="$enable_embedded"
-+ kde_use_qt_emb=$enableval
-+else
-+ kde_use_qt_emb=no
-+
-+fi;
-+
-+# Check whether --enable-qtopia or --disable-qtopia was given.
-+if test "${enable_qtopia+set}" = set; then
-+ enableval="$enable_qtopia"
-+ kde_use_qt_emb_palm=$enableval
-+else
-+ kde_use_qt_emb_palm=no
-+
-+fi;
-+
-+# Check whether --enable-mac or --disable-mac was given.
-+if test "${enable_mac+set}" = set; then
-+ enableval="$enable_mac"
-+ kde_use_qt_mac=$enableval
-+else
-+ kde_use_qt_mac=no
-+
-+fi;
-+
-+# used to disable x11-specific stuff on special platforms
-+
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+ include_x11_TRUE=
-+ include_x11_FALSE='#'
-+else
-+ include_x11_TRUE='#'
-+ include_x11_FALSE=
-+fi
-+
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+
-+echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6
-+
-+if test "${kde_cv_have_x+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # One or both of the vars are not set, and there is no cached value.
-+if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-+ kde_x_includes=NO
-+else
-+ kde_x_includes=$x_includes
-+fi
-+if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-+ kde_x_libraries=NO
-+else
-+ kde_x_libraries=$x_libraries
-+fi
-+
-+# below we use the standard autoconf calls
-+ac_x_libraries=$kde_x_libraries
-+ac_x_includes=$kde_x_includes
-+
-+
-+
-+
-+if test "$ac_x_includes" = NO; then
-+ # Guess where to find include files, by looking for this one X11 .h file.
-+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+
-+ # First, try using that file with no special directory specified.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # We can compile using X headers with no special include directory.
-+ac_x_includes=
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Look for the header file in a standard set of common directories.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+ for ac_dir in \
-+ /usr/X11/include \
-+ /usr/X11R6/include \
-+ /usr/X11R5/include \
-+ /usr/X11R4/include \
-+ \
-+ /usr/include/X11 \
-+ /usr/include/X11R6 \
-+ /usr/include/X11R5 \
-+ /usr/include/X11R4 \
-+ \
-+ /usr/local/X11/include \
-+ /usr/local/X11R6/include \
-+ /usr/local/X11R5/include \
-+ /usr/local/X11R4/include \
-+ \
-+ /usr/local/include/X11 \
-+ /usr/local/include/X11R6 \
-+ /usr/local/include/X11R5 \
-+ /usr/local/include/X11R4 \
-+ \
-+ /usr/X386/include \
-+ /usr/x386/include \
-+ /usr/XFree86/include/X11 \
-+ \
-+ /usr/include \
-+ /usr/local/include \
-+ /usr/unsupported/include \
-+ /usr/athena/include \
-+ /usr/local/x11r5/include \
-+ /usr/lpp/Xamples/include \
-+ \
-+ /usr/openwin/include \
-+ /usr/openwin/share/include \
-+ ; \
-+ do
-+ if test -r "$ac_dir/$x_direct_test_include"; then
-+ ac_x_includes=$ac_dir
-+ break
-+ fi
-+ done
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = NO
-+
-+if test "$ac_x_libraries" = NO; then
-+ # Check for the libraries.
-+
-+ test -z "$x_direct_test_library" && x_direct_test_library=Xt
-+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+
-+ # See if we find them without any special options.
-+ # Don't add to $LIBS permanently.
-+ ac_save_LIBS="$LIBS"
-+ LIBS="-l$x_direct_test_library $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <X11/Intrinsic.h>
-+int
-+main ()
-+{
-+${x_direct_test_function}(1)
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ LIBS="$ac_save_LIBS"
-+# We can link X programs with no special library path.
-+ac_x_libraries=
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+LIBS="$ac_save_LIBS"
-+# First see if replacing the include by lib works.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-+ /usr/X11/lib${kdelibsuff} \
-+ /usr/X11R6/lib${kdelibsuff} \
-+ /usr/X11R5/lib${kdelibsuff} \
-+ /usr/X11R4/lib${kdelibsuff} \
-+ \
-+ /usr/lib${kdelibsuff}/X11 \
-+ /usr/lib${kdelibsuff}/X11R6 \
-+ /usr/lib${kdelibsuff}/X11R5 \
-+ /usr/lib${kdelibsuff}/X11R4 \
-+ \
-+ /usr/local/X11/lib${kdelibsuff} \
-+ /usr/local/X11R6/lib${kdelibsuff} \
-+ /usr/local/X11R5/lib${kdelibsuff} \
-+ /usr/local/X11R4/lib${kdelibsuff} \
-+ \
-+ /usr/local/lib${kdelibsuff}/X11 \
-+ /usr/local/lib${kdelibsuff}/X11R6 \
-+ /usr/local/lib${kdelibsuff}/X11R5 \
-+ /usr/local/lib${kdelibsuff}/X11R4 \
-+ \
-+ /usr/X386/lib${kdelibsuff} \
-+ /usr/x386/lib${kdelibsuff} \
-+ /usr/XFree86/lib${kdelibsuff}/X11 \
-+ \
-+ /usr/lib${kdelibsuff} \
-+ /usr/local/lib${kdelibsuff} \
-+ /usr/unsupported/lib${kdelibsuff} \
-+ /usr/athena/lib${kdelibsuff} \
-+ /usr/local/x11r5/lib${kdelibsuff} \
-+ /usr/lpp/Xamples/lib${kdelibsuff} \
-+ /lib/usr/lib${kdelibsuff}/X11 \
-+ \
-+ /usr/openwin/lib${kdelibsuff} \
-+ /usr/openwin/share/lib${kdelibsuff} \
-+ ; \
-+do
-+ for ac_extension in a so sl; do
-+ if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+ ac_x_libraries=$ac_dir
-+ break 2
-+ fi
-+ done
-+done
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = NO
-+
-+case "$host" in
-+mips-sgi-irix6*)
-+ ;;
-+*-*-solaris*)
-+ ;;
-+*)
-+ rm -fr 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.
-+ cat >Imakefile <<'_ACEOF'
-+acfindx:
-+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+_ACEOF
-+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-+ for ac_extension in a so sl; do
-+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-+ test -f $ac_im_libdir/libX11.$ac_extension; then
-+ ac_im_usrlibdir=$ac_im_libdir; break
-+ fi
-+ done
-+ # Screen out bogus values from the imake configuration. They are
-+ # bogus both because they are the default anyway, and because
-+ # using them would break gcc on systems where it needs fixed includes.
-+ case $ac_im_incroot in
-+ /usr/include) ;;
-+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-+ esac
-+ case $ac_im_usrlibdir in
-+ /usr/lib | /lib) ;;
-+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-+ esac
-+ fi
-+ cd ..
-+ rm -fr conftest.dir
-+fi
-+
-+ if test -z "$ac_x_includes"; then
-+ ac_x_includes="."
-+ fi
-+ if test -z "$ac_x_libraries"; then
-+ ac_x_libraries="/usr/lib${kdelibsuff}"
-+ fi
-+esac
-+#from now on we use our own again
-+
-+# when the user already gave --x-includes, we ignore
-+# what the standard autoconf macros told us.
-+if test "$kde_x_includes" = NO; then
-+ kde_x_includes=$ac_x_includes
-+fi
-+
-+# for --x-libraries too
-+if test "$kde_x_libraries" = NO; then
-+ kde_x_libraries=$ac_x_libraries
-+fi
-+
-+if test "$kde_x_includes" = NO; then
-+ { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-+echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if test "$kde_x_libraries" = NO; then
-+ { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-+echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Record where we found X for the cache.
-+kde_cv_have_x="have_x=yes \
-+ kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-+
-+fi
-+
-+eval "$kde_cv_have_x"
-+
-+if test "$have_x" != yes; then
-+ echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6
-+ no_x=yes
-+else
-+ echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-+echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-+fi
-+
-+if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-+ X_INCLUDES=""
-+ x_includes="."; else
-+ x_includes=$kde_x_includes
-+ X_INCLUDES="-I$x_includes"
-+fi
-+
-+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-+ X_LDFLAGS=""
-+ x_libraries="/usr/lib"; else
-+ x_libraries=$kde_x_libraries
-+ X_LDFLAGS="-L$x_libraries"
-+fi
-+all_includes="$X_INCLUDES"
-+all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-+
-+# Check for libraries that X11R6 Xt/Xaw programs need.
-+ac_save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+# check for ICE first), but we must link in the order -lSM -lICE or
-+# we get undefined symbols. So assume we have SM if we have ICE.
-+# These have to be linked with before -lX11, unlike the other
-+# libraries we check for below, so use a different variable.
-+# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
-+echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $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 IceConnectionNumber ();
-+int
-+main ()
-+{
-+IceConnectionNumber ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_ICE_IceConnectionNumber=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-+ LIBSM="-lSM -lICE"
-+fi
-+
-+LDFLAGS="$ac_save_LDFLAGS"
-+
-+LIB_X11='-lX11 $(LIBSOCKET)'
-+
-+echo "$as_me:$LINENO: checking for libXext" >&5
-+echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-+if test "${kde_cv_have_libXext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_ldflags_safe="$LDFLAGS"
-+kde_libs_safe="$LIBS"
-+
-+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LIBS="-lXext -lX11 $LIBSOCKET"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <stdio.h>
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+
-+int
-+main ()
-+{
-+
-+printf("hello Xext\n");
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_have_libXext=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_have_libXext=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+LDFLAGS=$kde_ldflags_safe
-+LIBS=$kde_libs_safe
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-+echo "${ECHO_T}$kde_cv_have_libXext" >&6
-+
-+if test "$kde_cv_have_libXext" = "no"; then
-+ { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either." >&5
-+echo "$as_me: error: We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+LIB_XEXT="-lXext"
-+QTE_NORTTI=""
-+
-+elif test "$kde_use_qt_emb" = "yes"; then
-+ CPPFLAGS=-DQWS
-+ CXXFLAGS="$CXXFLAGS -fno-rtti"
-+ QTE_NORTTI="-fno-rtti -DQWS"
-+ X_PRE_LIBS=""
-+ LIB_X11=""
-+ LIB_XEXT=""
-+ LIB_XRENDER=""
-+ LIBSM=""
-+ X_INCLUDES=""
-+ X_LDFLAGS=""
-+ x_includes=""
-+ x_libraries=""
-+elif test "$kde_use_qt_mac" = "yes"; then
-+ CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-+ CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-+ X_PRE_LIBS=""
-+ LIB_X11=""
-+ LIB_XEXT=""
-+ LIB_XRENDER=""
-+ LIBSM=""
-+ X_INCLUDES=""
-+ X_LDFLAGS=""
-+ x_includes=""
-+ x_libraries=""
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ LIBPTHREAD=""
-+
-+ if test -n "$PTHREAD_LIBS"; then
-+ if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-+ LIBPTHREAD="PTHREAD"
-+ else
-+ PTHREAD_LIBS_save="$PTHREAD_LIBS"
-+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-+ echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
-+
-+ kde_save_LDFLAGS="$LDFLAGS"
-+ kde_save_LIBS="$LIBS"
-+ LDFLAGS="$LDFLAGS $all_libraries"
-+ case $host_os in
-+ aix*) LDFLAGS="-brtl $LDFLAGS"
-+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+ ;;
-+ esac
-+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$PTHREAD_LIBS $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 pthread_create ();
-+int
-+main ()
-+{
-+pthread_create ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_Lib=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Lib=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+ LIBPTHREAD="$PTHREAD_LIBS_save"
-+fi
-+
-+ LDFLAGS="$kde_save_LDFLAGS"
-+ LIBS="$kde_save_LIBS"
-+
-+ PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+ fi
-+ fi
-+
-+ if test -z "$LIBPTHREAD"; then
-+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread $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 pthread_create ();
-+int
-+main ()
-+{
-+pthread_create ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_pthread_pthread_create=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_pthread_pthread_create=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-+if test $ac_cv_lib_pthread_pthread_create = yes; then
-+ LIBPTHREAD="-lpthread"
-+fi
-+
-+ fi
-+
-+ if test -z "$LIBPTHREAD" ; then
-+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ kde_safe_libs=$LIBS
-+ LIBS="$LIBS -lpthread"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <pthread.h>
-+int
-+main ()
-+{
-+(void)pthread_create(0,0,0,0);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ LIBPTHREAD="-lpthread"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$kde_safe_libs
-+ fi
-+
-+ if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-+ LIBPTHREAD=""
-+ fi
-+
-+
-+
-+
-+ USE_THREADS=""
-+ if test -z "$LIBPTHREAD"; then
-+
-+echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-+echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
-+kde_cache=`echo pthread | 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'
-+
-+
-+ save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ 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;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "kde_cv_prog_cxx_$kde_cache=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ CXXFLAGS="$save_CXXFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+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
-+ :
-+ USE_THREADS="-D_THREAD_SAFE -pthread"
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ :
-+
-+fi
-+
-+ fi
-+
-+
-+
-+ case $host_os in
-+ solaris*)
-+
-+echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-+echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
-+kde_cache=`echo mt | 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'
-+
-+
-+ save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -mt"
-+ 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;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "kde_cv_prog_cxx_$kde_cache=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ CXXFLAGS="$save_CXXFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+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
-+ :
-+ USE_THREADS="-mt"
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ :
-+
-+fi
-+
-+ CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-+ ;;
-+ freebsd*)
-+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-+ ;;
-+ aix*)
-+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+ LIBPTHREAD="$LIBPTHREAD -lc_r"
-+ ;;
-+ linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+ if test "$CXX" = "KCC"; then
-+ CXXFLAGS="$CXXFLAGS --thread_safe"
-+ NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-+ fi
-+ ;;
-+ *)
-+ ;;
-+ esac
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for extra includes" >&5
-+echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
-+
-+# Check whether --with-extra-includes or --without-extra-includes was given.
-+if test "${with_extra_includes+set}" = set; then
-+ withval="$with_extra_includes"
-+ kde_use_extra_includes="$withval"
-+else
-+ kde_use_extra_includes=NONE
-+
-+fi;
-+kde_extra_includes=
-+if test -n "$kde_use_extra_includes" && \
-+ test "$kde_use_extra_includes" != "NONE"; then
-+
-+ ac_save_ifs=$IFS
-+ IFS=':'
-+ for dir in $kde_use_extra_includes; do
-+ kde_extra_includes="$kde_extra_includes $dir"
-+ USER_INCLUDES="$USER_INCLUDES -I$dir"
-+ done
-+ IFS=$ac_save_ifs
-+ kde_use_extra_includes="added"
-+else
-+ kde_use_extra_includes="no"
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-+echo "${ECHO_T}$kde_use_extra_includes" >&6
-+
-+kde_extra_libs=
-+echo "$as_me:$LINENO: checking for extra libs" >&5
-+echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
-+
-+# Check whether --with-extra-libs or --without-extra-libs was given.
-+if test "${with_extra_libs+set}" = set; then
-+ withval="$with_extra_libs"
-+ kde_use_extra_libs=$withval
-+else
-+ kde_use_extra_libs=NONE
-+
-+fi;
-+if test -n "$kde_use_extra_libs" && \
-+ test "$kde_use_extra_libs" != "NONE"; then
-+
-+ ac_save_ifs=$IFS
-+ IFS=':'
-+ for dir in $kde_use_extra_libs; do
-+ kde_extra_libs="$kde_extra_libs $dir"
-+ KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-+ USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+ done
-+ IFS=$ac_save_ifs
-+ kde_use_extra_libs="added"
-+else
-+ kde_use_extra_libs="no"
-+fi
-+
-+
-+
-+echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-+echo "${ECHO_T}$kde_use_extra_libs" >&6
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libz" >&5
-+echo $ECHO_N "checking for libz... $ECHO_C" >&6
-+if test "${ac_cv_lib_z+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include<zlib.h>
-+
-+int
-+main ()
-+{
-+
-+ char buf[42];
-+ gzFile f = (gzFile) 0;
-+ /* this would segfault.. but we only link, don't run */
-+ (void) gzgets(f, buf, sizeof(buf));
-+
-+ return (zlibVersion() == ZLIB_VERSION);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_z='-lz'"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_z=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if test ! "$ac_cv_lib_z" = no; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBZ 1
-+_ACEOF
-+
-+ LIBZ="$ac_cv_lib_z"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-+echo "${ECHO_T}$ac_cv_lib_z" >&6
-+else
-+ { { echo "$as_me:$LINENO: error: not found.
-+ Possibly configure picks up an outdated version
-+ installed by XFree86. Remove it from your system.
-+
-+ Check your installation and look into config.log" >&5
-+echo "$as_me: error: not found.
-+ Possibly configure picks up an outdated version
-+ installed by XFree86. Remove it from your system.
-+
-+ Check your installation and look into config.log" >&2;}
-+ { (exit 1); exit 1; }; }
-+ LIBZ=""
-+fi
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+fi
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include<png.h>
-+
-+int
-+main ()
-+{
-+
-+ png_structp png_ptr = png_create_read_struct( /* image ptr */
-+ PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+ return( png_ptr != 0 );
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_png=no"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPNG 1
-+_ACEOF
-+
-+ LIBPNG="$ac_cv_lib_png"
-+
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBPNG=""
-+
-+fi
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_jpeg_6b=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_6b"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_jpeg_normal=-ljpeg"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_jpeg_normal=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_normal"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+ LIBJPEG=
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+
-+jpeg_incdir=NO
-+for i in $jpeg_incdirs;
-+do
-+ for j in jpeglib.h;
-+ do
-+ echo "configure: 29388: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ jpeg_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBJPEG 1
-+_ACEOF
-+
-+else
-+ if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+ { echo "$as_me:$LINENO: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&5
-+echo "$as_me: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&2;}
-+ else
-+ { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-+echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-+ fi
-+ jpeg_incdir=
-+ LIBJPEG=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for perl" >&5
-+echo $ECHO_N "checking for perl... $ECHO_C" >&6
-+ if test -n "$PERL"; then
-+ kde_cv_path="$PERL";
-+ else
-+ kde_cache=`echo perl | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$bindir $exec_prefix/bin $prefix/bin $dirs"
-+ else dirs="$dirs $bindir $exec_prefix/bin $prefix/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/perl"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/perl 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/perl"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/perl"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
-+We need perl to generate some code." >&5
-+echo "$as_me: error: No Perl found in your $PATH.
-+We need perl to generate some code." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PERL=$kde_cv_path
-+
-+ fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check whether --enable-mt or --disable-mt was given.
-+if test "${enable_mt+set}" = set; then
-+ enableval="$enable_mt"
-+ kde_use_qt_mt=$enableval
-+else
-+
-+ if test $kde_qtver = 3; then
-+ kde_use_qt_mt=yes
-+ else
-+ kde_use_qt_mt=no
-+ fi
-+
-+
-+fi;
-+
-+USING_QT_MT=""
-+
-+
-+KDE_MT_LDFLAGS=
-+KDE_MT_LIBS=
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+
-+
-+
-+ if test -z "$LIBPTHREAD"; then
-+ if test -z "$USE_THREADS"; then
-+ kde_check_threading_default=no
-+ else
-+ kde_check_threading_default=yes
-+ fi
-+ else
-+ kde_check_threading_default=yes
-+ fi
-+ # Check whether --enable-threading or --disable-threading was given.
-+if test "${enable_threading+set}" = set; then
-+ enableval="$enable_threading"
-+ kde_use_threading=$enableval
-+else
-+ kde_use_threading=$kde_check_threading_default
-+fi;
-+ if test "x$kde_use_threading" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBPTHREAD 1
-+_ACEOF
-+
-+ fi
-+
-+ if test "x$kde_use_threading" = "xyes"; then
-+ CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-+ KDE_MT_LDFLAGS="$USE_THREADS"
-+ KDE_MT_LIBS="$LIBPTHREAD"
-+ else
-+ kde_use_qt_mt=no
-+ fi
-+fi
-+
-+
-+
-+kde_qt_was_given=yes
-+
-+if test -z "$LIBQT_GLOB"; then
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+ LIBQT_GLOB="libqte.*"
-+ else
-+ LIBQT_GLOB="libqt.*"
-+ fi
-+fi
-+
-+if test "x$kde_use_qt_emb" = "xyes"; then
-+ qtlib="qte"
-+else
-+ qtlib="qt"
-+fi
-+
-+kde_int_qt="-l$qtlib"
-+
-+if test -z "$LIBQPE"; then
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+ if test "x$kde_use_qt_emb_palm" = "xyes"; then
-+ LIB_QPE="-lqpe"
-+ else
-+ LIB_QPE=""
-+ fi
-+ else
-+ LIB_QPE=""
-+ fi
-+fi
-+
-+
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+ LIBQT="-l$qtlib-mt"
-+ kde_int_qt="-l$qtlib-mt"
-+ LIBQT_GLOB="lib$qtlib-mt.*"
-+ USING_QT_MT="using -mt"
-+else
-+ LIBQT="-l$qtlib"
-+fi
-+
-+if test $kde_qtver != 1; then
-+
-+
-+
-+ LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-+fi
-+
-+if test $kde_qtver = 3; then
-+
-+ LIBQT="$LIBQT $LIBDL"
-+fi
-+
-+echo "$as_me:$LINENO: checking for Qt" >&5
-+echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-+fi
-+ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-+qt_libraries=""
-+qt_includes=""
-+
-+# Check whether --with-qt-dir or --without-qt-dir was given.
-+if test "${with_qt_dir+set}" = set; then
-+ withval="$with_qt_dir"
-+ ac_qt_includes="$withval"/include
-+ ac_qt_libraries="$withval"/lib${kdelibsuff}
-+ ac_qt_bindir="$withval"/bin
-+
-+fi;
-+
-+
-+# Check whether --with-qt-includes or --without-qt-includes was given.
-+if test "${with_qt_includes+set}" = set; then
-+ withval="$with_qt_includes"
-+
-+ ac_qt_includes="$withval"
-+
-+fi;
-+
-+kde_qt_libs_given=no
-+
-+
-+# Check whether --with-qt-libraries or --without-qt-libraries was given.
-+if test "${with_qt_libraries+set}" = set; then
-+ withval="$with_qt_libraries"
-+ ac_qt_libraries="$withval"
-+ kde_qt_libs_given=yes
-+
-+fi;
-+
-+if test "${ac_cv_have_qt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ #try to guess Qt locations
-+
-+qt_incdirs=""
-+for dir in $kde_qt_dirs; do
-+ qt_incdirs="$qt_incdirs $dir/include $dir"
-+done
-+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-+if test ! "$ac_qt_includes" = "NO"; then
-+ qt_incdirs="$ac_qt_includes $qt_incdirs"
-+fi
-+
-+if test "$kde_qtver" != "1"; then
-+ kde_qt_header=qstyle.h
-+else
-+ kde_qt_header=qglobal.h
-+fi
-+
-+
-+qt_incdir=NO
-+for i in $qt_incdirs;
-+do
-+ for j in $kde_qt_header;
-+ do
-+ echo "configure: 29686: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ qt_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_qt_includes="$qt_incdir"
-+
-+qt_libdirs=""
-+for dir in $kde_qt_dirs; do
-+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-+done
-+qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-+if test ! "$ac_qt_libraries" = "NO"; then
-+ qt_libdir=$ac_qt_libraries
-+else
-+ qt_libdirs="$ac_qt_libraries $qt_libdirs"
-+ # if the Qt was given, the chance is too big that libqt.* doesn't exist
-+ qt_libdir=NONE
-+ for dir in $qt_libdirs; do
-+ try="ls -1 $dir/${LIBQT_GLOB}"
-+ if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-+ done
-+fi
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+ if test -e "$a"; then
-+ LIBQT="$LIBQT ${kde_int_qt}_incremental"
-+ break
-+ fi
-+done
-+
-+ac_qt_libraries="$qt_libdir"
-+
-+
-+
-+ 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'
-+
-+
-+
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-+
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+ QStringList *t = new QStringList();
-+ Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+ QString s;
-+ s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+ (void)QStyleFactory::create(QString::null);
-+ QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+ return 0;
-+}
-+EOF
-+
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest; then
-+ rm -f conftest*
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ ac_qt_libraries="NO"
-+fi
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-+ ac_cv_have_qt="have_qt=no"
-+ ac_qt_notfound=""
-+ missing_qt_mt=""
-+ if test "$ac_qt_includes" = NO; then
-+ if test "$ac_qt_libraries" = NO; then
-+ ac_qt_notfound="(headers and libraries)";
-+ else
-+ ac_qt_notfound="(headers)";
-+ fi
-+ else
-+ if test "x$kde_use_qt_mt" = "xyes"; then
-+ missing_qt_mt="
-+Make sure that you have compiled Qt with thread support!"
-+ ac_qt_notfound="(library $qtlib-mt)";
-+ else
-+ ac_qt_notfound="(library $qtlib)";
-+ fi
-+ fi
-+
-+ { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
-+echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ have_qt="yes"
-+fi
-+
-+fi
-+
-+
-+eval "$ac_cv_have_qt"
-+
-+if test "$have_qt" != yes; then
-+ echo "$as_me:$LINENO: result: $have_qt" >&5
-+echo "${ECHO_T}$have_qt" >&6;
-+else
-+ ac_cv_have_qt="have_qt=yes \
-+ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-+ echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-+echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
-+
-+ qt_libraries="$ac_qt_libraries"
-+ qt_includes="$ac_qt_includes"
-+fi
-+
-+if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-+
-+
-+echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-+echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
-+if test "${kde_cv_qt_direct+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'
-+
-+
-+ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-+ac_LIBRARY_PATH="$LIBRARY_PATH"
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_includes"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBQT $LIBSOCKET"
-+fi
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH=
-+export LIBRARY_PATH
-+
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+ QStringList *t = new QStringList();
-+ Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+ QString s;
-+ s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+ (void)QStyleFactory::create(QString::null);
-+ QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+ return 0;
-+}
-+EOF
-+
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest; then
-+ kde_cv_qt_direct="yes"
-+else
-+ kde_cv_qt_direct="no"
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+fi
-+
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH="$ac_LIBRARY_PATH"
-+export LIBRARY_PATH
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+if test "$kde_cv_qt_direct" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ qt_libraries=
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+
-+if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-+ QT_INCLUDES=""
-+else
-+ QT_INCLUDES="-I$qt_includes"
-+ all_includes="$QT_INCLUDES $all_includes"
-+fi
-+
-+if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-+ QT_LDFLAGS=""
-+else
-+ QT_LDFLAGS="-L$qt_libraries"
-+ all_libraries="$QT_LDFLAGS $all_libraries"
-+fi
-+test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-+
-+
-+
-+
-+
-+ qt_bindirs=""
-+ for dir in $kde_qt_dirs; do
-+ qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-+ done
-+ qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-+ if test ! "$ac_qt_bindir" = "NO"; then
-+ qt_bindirs="$ac_qt_bindir $qt_bindirs"
-+ fi
-+
-+
-+ echo "$as_me:$LINENO: checking for moc" >&5
-+echo $ECHO_N "checking for moc... $ECHO_C" >&6
-+ if test -n "$MOC"; then
-+ kde_cv_path="$MOC";
-+ else
-+ kde_cache=`echo moc | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$qt_bindirs $dirs"
-+ else dirs="$dirs $qt_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/moc"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/moc 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/moc"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/moc"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+" >&5
-+echo "$as_me: error: No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MOC=$kde_cv_path
-+
-+ fi
-+
-+ if test -z "$UIC_NOT_NEEDED"; then
-+
-+ echo "$as_me:$LINENO: checking for uic" >&5
-+echo $ECHO_N "checking for uic... $ECHO_C" >&6
-+ if test -n "$UIC_PATH"; then
-+ kde_cv_path="$UIC_PATH";
-+ else
-+ kde_cache=`echo uic | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$qt_bindirs $dirs"
-+ else dirs="$dirs $qt_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/uic"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/uic 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/uic"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/uic"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ UIC_PATH=""
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ UIC_PATH=$kde_cv_path
-+
-+ fi
-+
-+ if test -z "$UIC_PATH" ; then
-+
-+ { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+" >&5
-+echo "$as_me: WARNING: No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+" >&2;}
-+
-+ exit 1
-+ else
-+ UIC=$UIC_PATH
-+
-+ if test $kde_qtver = 3; then
-+
-+ echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-+echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
-+ kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
-+ if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ cat >conftest.ui <<EOT
-+ <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+ ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-+ (eval $ac_uic_testrun) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ eval "kde_cv_prog_uic_$kde_cache=yes"
-+ else
-+ eval "kde_cv_prog_uic_$kde_cache=no"
-+ fi
-+ rm -f conftest*
-+
-+fi
-+
-+
-+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+ ac_uic_supports_libpath=yes
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ :
-+ ac_uic_supports_libpath=no
-+ fi
-+
-+
-+ echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-+echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
-+ kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
-+ if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ cat >conftest.ui <<EOT
-+ <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+ ac_uic_testrun="$UIC_PATH -nounload conftest.ui >/dev/null"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-+ (eval $ac_uic_testrun) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ eval "kde_cv_prog_uic_$kde_cache=yes"
-+ else
-+ eval "kde_cv_prog_uic_$kde_cache=no"
-+ fi
-+ rm -f conftest*
-+
-+fi
-+
-+
-+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ :
-+ ac_uic_supports_nounload=yes
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ :
-+ ac_uic_supports_nounload=no
-+ fi
-+
-+
-+ if test x$ac_uic_supports_libpath = xyes; then
-+ UIC="$UIC -L \$(kde_widgetdir)"
-+ fi
-+ if test x$ac_uic_supports_nounload = xyes; then
-+ UIC="$UIC -nounload"
-+ fi
-+ fi
-+ fi
-+ else
-+ UIC="echo uic not available: "
-+ fi
-+
-+
-+
-+
-+ UIC_TR="i18n"
-+ if test $kde_qtver = 3; then
-+ UIC_TR="tr2i18n"
-+ fi
-+
-+
-+
-+
-+
-+if test -n "$LIBJPEG"; then
-+echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-+echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
-+if test "${kde_cv_qt_jpeg+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'
-+
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-+LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <qapplication.h>
-+int
-+main ()
-+{
-+
-+ int argc;
-+ char** argv;
-+ QApplication app(argc, argv);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "kde_cv_qt_jpeg=no"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "kde_cv_qt_jpeg=yes"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ LIBJPEG_QT='$(LIBJPEG)'
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBJPEG_QT=
-+fi
-+
-+
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-+else
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-+fi
-+test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+ if test -e "$a"; then
-+ LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-+ break
-+ fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for rpath" >&5
-+echo $ECHO_N "checking for rpath... $ECHO_C" >&6
-+# Check whether --enable-rpath or --disable-rpath was given.
-+if test "${enable_rpath+set}" = set; then
-+ enableval="$enable_rpath"
-+ USE_RPATH=$enableval
-+else
-+ USE_RPATH=yes
-+fi;
-+
-+if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-+
-+ KDE_RPATH="-R \$(libdir)"
-+
-+ if test "$kde_libraries" != "$libdir"; then
-+ KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
-+ fi
-+
-+ if test -n "$qt_libraries"; then
-+ KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-+ fi
-+ if test -n "$X_LDFLAGS"; then
-+ X_RPATH="-R \$(x_libraries)"
-+ KDE_RPATH="$KDE_RPATH $X_RPATH"
-+ fi
-+ if test -n "$KDE_EXTRA_RPATH"; then
-+ KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-+ fi
-+fi
-+
-+
-+
-+echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-+echo "${ECHO_T}$USE_RPATH" >&6
-+
-+echo "$as_me:$LINENO: checking for KDE" >&5
-+echo $ECHO_N "checking for KDE... $ECHO_C" >&6
-+
-+if test "${prefix}" != NONE; then
-+ kde_includes=${includedir}
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$includedir
-+while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done
-+exec_prefix=$savex
-+
-+
-+ kde_libraries=${libdir}
-+
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$libdir
-+while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done
-+exec_prefix=$savex
-+
-+
-+else
-+ ac_kde_includes=
-+ ac_kde_libraries=
-+ kde_libraries=""
-+ kde_includes=""
-+fi
-+
-+if test "${ac_cv_have_kde+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ #try to guess kde locations
-+
-+if test "$kde_qtver" = 1; then
-+ kde_check_header="ksock.h"
-+ kde_check_lib="libkdecore.la"
-+else
-+ kde_check_header="ksharedptr.h"
-+ kde_check_lib="libkio.la"
-+fi
-+
-+if test -z ""; then
-+
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-+kde_incdirs="$ac_kde_includes $kde_incdirs"
-+
-+kde_incdir=NO
-+for i in $kde_incdirs;
-+do
-+ for j in $kde_check_header;
-+ do
-+ echo "configure: 30522: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kde_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_kde_includes="$kde_incdir"
-+
-+if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-+ { { echo "$as_me:$LINENO: error:
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!" >&5
-+echo "$as_me: error:
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-+kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-+
-+kde_libdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in $kde_check_lib;
-+ do
-+ echo "configure: 30552: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kde_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+kde_widgetdir=NO
-+
-+kde_widgetdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in "kde3/plugins/designer/kdewidgets.la";
-+ do
-+ echo "configure: 30570: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kde_widgetdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+
-+if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-+{ { echo "$as_me:$LINENO: error:
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!" >&5
-+echo "$as_me: error:
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+{ { echo "$as_me:$LINENO: error:
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs" >&5
-+echo "$as_me: error:
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if test -n "$kde_widgetdir"; then
-+ kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+fi
-+
-+
-+if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-+ ac_cv_have_kde="have_kde=no"
-+else
-+ ac_cv_have_kde="have_kde=yes \
-+ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+fi
-+
-+else
-+ ac_cv_have_kde="have_kde=no"
-+
-+fi
-+
-+fi
-+
-+eval "$ac_cv_have_kde"
-+
-+if test "$have_kde" != "yes"; then
-+ if test "${prefix}" = NONE; then
-+ ac_kde_prefix="$ac_default_prefix"
-+ else
-+ ac_kde_prefix="$prefix"
-+ fi
-+ if test "$exec_prefix" = NONE; then
-+ ac_kde_exec_prefix="$ac_kde_prefix"
-+ echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
-+ else
-+ ac_kde_exec_prefix="$exec_prefix"
-+ echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
-+ fi
-+
-+ kde_libraries="${libdir}"
-+ kde_includes="${includedir}"
-+
-+else
-+ ac_cv_have_kde="have_kde=yes \
-+ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+ echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-+echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
-+
-+ kde_libraries="$ac_kde_libraries"
-+ kde_includes="$ac_kde_includes"
-+fi
-+
-+
-+
-+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then
-+ KDE_INCLUDES=""
-+else
-+ KDE_INCLUDES="-I$kde_includes"
-+ all_includes="$KDE_INCLUDES $all_includes"
-+fi
-+
-+KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-+
-+KDE_LDFLAGS="-L$kde_libraries"
-+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
-+ all_libraries="$KDE_LDFLAGS $all_libraries"
-+fi
-+
-+
-+
-+
-+
-+
-+all_libraries="$all_libraries $USER_LDFLAGS"
-+all_includes="$all_includes $USER_INCLUDES"
-+
-+
-+
-+if test -z ""; then
-+
-+
-+
-+if test x$ac_uic_supports_libpath = xyes; then
-+
-+echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-+echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
-+if test "${kde_cv_uic_plugins+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat > actest.ui << EOF
-+<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-+<class>NewConnectionDialog</class>
-+<widget class="QDialog">
-+ <widget class="KLineEdit">
-+ <property name="name">
-+ <cstring>testInput</cstring>
-+ </property>
-+ </widget>
-+</widget>
-+</UI>
-+EOF
-+
-+
-+
-+kde_cv_uic_plugins=no
-+kde_line="$UIC_PATH -L $kde_widgetdir"
-+if test x$ac_uic_supports_nounload = xyes; then
-+ kde_line="$kde_line -nounload"
-+fi
-+kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-+if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
-+ (eval $kde_line) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # if you're trying to debug this check and think it's incorrect,
-+ # better check your installation. The check _is_ correct - your
-+ # installation is not.
-+ if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-+ kde_cv_uic_plugins=yes
-+ fi
-+fi
-+rm -f actest.ui actest.cpp
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-+echo "${ECHO_T}$kde_cv_uic_plugins" >&6
-+if test "$kde_cv_uic_plugins" != yes; then
-+ { { echo "$as_me:$LINENO: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+" >&5
-+echo "$as_me: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+fi
-+
-+fi
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+
-+
-+
-+
-+ # Check whether --enable-path-check or --disable-path-check was given.
-+if test "${enable_path_check+set}" = set; then
-+ enableval="$enable_path_check"
-+
-+ if test "$enableval" = "no";
-+ then ac_use_path_checking="default"
-+ else ac_use_path_checking=""
-+ fi
-+
-+else
-+
-+ if test "$kde_qtver" = 1;
-+ then ac_use_path_checking=""
-+ else ac_use_path_checking="default"
-+ fi
-+
-+
-+fi;
-+
-+
-+
-+
-+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
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+if test "$ac_use_path_checking" = "default"; then
-+
-+ if test -z "$kde_htmldir"; then
-+ kde_htmldir='\${datadir}/doc/HTML'
-+ fi
-+ if test -z "$kde_appsdir"; then
-+ kde_appsdir='\${datadir}/applnk'
-+ fi
-+ if test -z "$kde_icondir"; then
-+ kde_icondir='\${datadir}/icons'
-+ fi
-+ if test -z "$kde_sounddir"; then
-+ kde_sounddir='\${datadir}/sounds'
-+ fi
-+ if test -z "$kde_datadir"; then
-+ kde_datadir='\${datadir}/apps'
-+ fi
-+ if test -z "$kde_locale"; then
-+ kde_locale='\${datadir}/locale'
-+ fi
-+ if test -z "$kde_cgidir"; then
-+ kde_cgidir='\${exec_prefix}/cgi-bin'
-+ fi
-+ if test -z "$kde_confdir"; then
-+ kde_confdir='\${datadir}/config'
-+ fi
-+ if test -z "$kde_kcfgdir"; then
-+ kde_kcfgdir='\${datadir}/config.kcfg'
-+ fi
-+ if test -z "$kde_mimedir"; then
-+ kde_mimedir='\${datadir}/mimelnk'
-+ fi
-+ if test -z "$kde_toolbardir"; then
-+ kde_toolbardir='\${datadir}/toolbar'
-+ fi
-+ if test -z "$kde_wallpaperdir"; then
-+ kde_wallpaperdir='\${datadir}/wallpapers'
-+ fi
-+ if test -z "$kde_templatesdir"; then
-+ kde_templatesdir='\${datadir}/templates'
-+ fi
-+ if test -z "$kde_bindir"; then
-+ kde_bindir='\${exec_prefix}/bin'
-+ fi
-+ if test -z "$kde_servicesdir"; then
-+ kde_servicesdir='\${datadir}/services'
-+ fi
-+ if test -z "$kde_servicetypesdir"; then
-+ kde_servicetypesdir='\${datadir}/servicetypes'
-+ fi
-+ if test -z "$kde_moduledir"; then
-+ if test "$kde_qtver" = "2"; then
-+ kde_moduledir='\${libdir}/kde2'
-+ else
-+ kde_moduledir='\${libdir}/kde3'
-+ fi
-+ fi
-+ if test -z "$kde_styledir"; then
-+ kde_styledir='\${libdir}/kde3/plugins/styles'
-+ fi
-+ if test -z "$kde_widgetdir"; then
-+ kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+ fi
-+ if test -z "$xdg_appsdir"; then
-+ xdg_appsdir='\${datadir}/applications/kde'
-+ fi
-+ if test -z "$xdg_menudir"; then
-+ xdg_menudir='\${sysconfdir}/xdg/menus'
-+ fi
-+ if test -z "$xdg_directorydir"; then
-+ xdg_directorydir='\${datadir}/desktop-directories'
-+ fi
-+
-+
-+ kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+ kde_htmldir=\"$kde_htmldir\" \
-+ kde_appsdir=\"$kde_appsdir\" \
-+ kde_icondir=\"$kde_icondir\" \
-+ kde_sounddir=\"$kde_sounddir\" \
-+ kde_datadir=\"$kde_datadir\" \
-+ kde_locale=\"$kde_locale\" \
-+ kde_cgidir=\"$kde_cgidir\" \
-+ kde_confdir=\"$kde_confdir\" \
-+ kde_kcfgdir=\"$kde_kcfgdir\" \
-+ kde_mimedir=\"$kde_mimedir\" \
-+ kde_toolbardir=\"$kde_toolbardir\" \
-+ kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+ kde_templatesdir=\"$kde_templatesdir\" \
-+ kde_bindir=\"$kde_bindir\" \
-+ kde_servicesdir=\"$kde_servicesdir\" \
-+ kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+ kde_moduledir=\"$kde_moduledir\" \
-+ kde_styledir=\"$kde_styledir\" \
-+ kde_widgetdir=\"$kde_widgetdir\" \
-+ xdg_appsdir=\"$xdg_appsdir\" \
-+ xdg_menudir=\"$xdg_menudir\" \
-+ xdg_directorydir=\"$xdg_directorydir\" \
-+ kde_result=defaults"
-+
-+
-+else
-+
-+ if test $kde_qtver = 1; then
-+ 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
-+
-+
-+ 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'
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+ printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+ printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+ printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+ printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+ printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+ printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+ printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+ printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+ printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+ printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+ printf("kde_wallpaperdir=\\"%s\\"\n",
-+ KApplication::kde_wallpaperdir().data());
-+ printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+ printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+ printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+ printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+ printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+ printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+ printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+ printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+ return 0;
-+ }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 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
-+ 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.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ CPPFLAGS=$ac_save_CPPFLAGS
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ KDE_TEST_RPATH=
-+
-+ if test -n "$USE_RPATH"; then
-+
-+ if test -n "$kde_libraries"; then
-+ KDE_TEST_RPATH="-R $kde_libraries"
-+ fi
-+
-+ if test -n "$qt_libraries"; then
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+ fi
-+
-+ if test -n "$x_libraries"; then
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+ fi
-+
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+ fi
-+
-+echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+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
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+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
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+ kde_result=done
-+else
-+ kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+
-+ kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+ kde_htmldir=\"$kde_htmldir\" \
-+ kde_appsdir=\"$kde_appsdir\" \
-+ kde_icondir=\"$kde_icondir\" \
-+ kde_sounddir=\"$kde_sounddir\" \
-+ kde_datadir=\"$kde_datadir\" \
-+ kde_locale=\"$kde_locale\" \
-+ kde_cgidir=\"$kde_cgidir\" \
-+ kde_confdir=\"$kde_confdir\" \
-+ kde_kcfgdir=\"$kde_kcfgdir\" \
-+ kde_mimedir=\"$kde_mimedir\" \
-+ kde_toolbardir=\"$kde_toolbardir\" \
-+ kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+ kde_templatesdir=\"$kde_templatesdir\" \
-+ kde_bindir=\"$kde_bindir\" \
-+ kde_servicesdir=\"$kde_servicesdir\" \
-+ kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+ kde_moduledir=\"$kde_moduledir\" \
-+ kde_styledir=\"$kde_styledir\" \
-+ kde_widgetdir=\"$kde_widgetdir\" \
-+ xdg_appsdir=\"$xdg_appsdir\" \
-+ xdg_menudir=\"$xdg_menudir\" \
-+ xdg_directorydir=\"$xdg_directorydir\" \
-+ kde_result=$kde_result"
-+
-+
-+
-+ else
-+ { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+fi
-+
-+ kde_cached_paths=no
-+
-+fi
-+
-+eval "$kde_cv_all_paths"
-+ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+ test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+ test -z "$kde_datadir" || test -z "$kde_locale" ||
-+ test -z "$kde_cgidir" || test -z "$kde_confdir" ||
-+ test -z "$kde_kcfgdir" ||
-+ test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+ test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+ test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+ test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+ test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+ test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+ test "x$kde_have_all_paths" != "xyes"; then
-+ kde_have_all_paths=no
-+ fi
-+
-+if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-+ # wrong values were cached, may be, we can set better ones
-+ kde_result=
-+ kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-+ kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir=
-+ kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-+ kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-+ kde_have_all_paths=
-+ kde_styledir=
-+ kde_widgetdir=
-+ xdg_appsdir = xdg_menudir= xdg_directorydir=
-+
-+if test "$ac_use_path_checking" = "default"; then
-+
-+ if test -z "$kde_htmldir"; then
-+ kde_htmldir='\${datadir}/doc/HTML'
-+ fi
-+ if test -z "$kde_appsdir"; then
-+ kde_appsdir='\${datadir}/applnk'
-+ fi
-+ if test -z "$kde_icondir"; then
-+ kde_icondir='\${datadir}/icons'
-+ fi
-+ if test -z "$kde_sounddir"; then
-+ kde_sounddir='\${datadir}/sounds'
-+ fi
-+ if test -z "$kde_datadir"; then
-+ kde_datadir='\${datadir}/apps'
-+ fi
-+ if test -z "$kde_locale"; then
-+ kde_locale='\${datadir}/locale'
-+ fi
-+ if test -z "$kde_cgidir"; then
-+ kde_cgidir='\${exec_prefix}/cgi-bin'
-+ fi
-+ if test -z "$kde_confdir"; then
-+ kde_confdir='\${datadir}/config'
-+ fi
-+ if test -z "$kde_kcfgdir"; then
-+ kde_kcfgdir='\${datadir}/config.kcfg'
-+ fi
-+ if test -z "$kde_mimedir"; then
-+ kde_mimedir='\${datadir}/mimelnk'
-+ fi
-+ if test -z "$kde_toolbardir"; then
-+ kde_toolbardir='\${datadir}/toolbar'
-+ fi
-+ if test -z "$kde_wallpaperdir"; then
-+ kde_wallpaperdir='\${datadir}/wallpapers'
-+ fi
-+ if test -z "$kde_templatesdir"; then
-+ kde_templatesdir='\${datadir}/templates'
-+ fi
-+ if test -z "$kde_bindir"; then
-+ kde_bindir='\${exec_prefix}/bin'
-+ fi
-+ if test -z "$kde_servicesdir"; then
-+ kde_servicesdir='\${datadir}/services'
-+ fi
-+ if test -z "$kde_servicetypesdir"; then
-+ kde_servicetypesdir='\${datadir}/servicetypes'
-+ fi
-+ if test -z "$kde_moduledir"; then
-+ if test "$kde_qtver" = "2"; then
-+ kde_moduledir='\${libdir}/kde2'
-+ else
-+ kde_moduledir='\${libdir}/kde3'
-+ fi
-+ fi
-+ if test -z "$kde_styledir"; then
-+ kde_styledir='\${libdir}/kde3/plugins/styles'
-+ fi
-+ if test -z "$kde_widgetdir"; then
-+ kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+ fi
-+ if test -z "$xdg_appsdir"; then
-+ xdg_appsdir='\${datadir}/applications/kde'
-+ fi
-+ if test -z "$xdg_menudir"; then
-+ xdg_menudir='\${sysconfdir}/xdg/menus'
-+ fi
-+ if test -z "$xdg_directorydir"; then
-+ xdg_directorydir='\${datadir}/desktop-directories'
-+ fi
-+
-+
-+ kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+ kde_htmldir=\"$kde_htmldir\" \
-+ kde_appsdir=\"$kde_appsdir\" \
-+ kde_icondir=\"$kde_icondir\" \
-+ kde_sounddir=\"$kde_sounddir\" \
-+ kde_datadir=\"$kde_datadir\" \
-+ kde_locale=\"$kde_locale\" \
-+ kde_cgidir=\"$kde_cgidir\" \
-+ kde_confdir=\"$kde_confdir\" \
-+ kde_kcfgdir=\"$kde_kcfgdir\" \
-+ kde_mimedir=\"$kde_mimedir\" \
-+ kde_toolbardir=\"$kde_toolbardir\" \
-+ kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+ kde_templatesdir=\"$kde_templatesdir\" \
-+ kde_bindir=\"$kde_bindir\" \
-+ kde_servicesdir=\"$kde_servicesdir\" \
-+ kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+ kde_moduledir=\"$kde_moduledir\" \
-+ kde_styledir=\"$kde_styledir\" \
-+ kde_widgetdir=\"$kde_widgetdir\" \
-+ xdg_appsdir=\"$xdg_appsdir\" \
-+ xdg_menudir=\"$xdg_menudir\" \
-+ xdg_directorydir=\"$xdg_directorydir\" \
-+ kde_result=defaults"
-+
-+
-+else
-+
-+ if test $kde_qtver = 1; then
-+ 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
-+
-+
-+ 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'
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+ printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+ printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+ printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+ printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+ printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+ printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+ printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+ printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+ printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+ printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+ printf("kde_wallpaperdir=\\"%s\\"\n",
-+ KApplication::kde_wallpaperdir().data());
-+ printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+ printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+ printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+ printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+ printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+ printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+ printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+ printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+ printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+ return 0;
-+ }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 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
-+ 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.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ CPPFLAGS=$ac_save_CPPFLAGS
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ KDE_TEST_RPATH=
-+
-+ if test -n "$USE_RPATH"; then
-+
-+ if test -n "$kde_libraries"; then
-+ KDE_TEST_RPATH="-R $kde_libraries"
-+ fi
-+
-+ if test -n "$qt_libraries"; then
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+ fi
-+
-+ if test -n "$x_libraries"; then
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+ fi
-+
-+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+ fi
-+
-+echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+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
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+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
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&5
-+echo "$as_me: error: your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+ kde_result=done
-+else
-+ kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+
-+ kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+ kde_htmldir=\"$kde_htmldir\" \
-+ kde_appsdir=\"$kde_appsdir\" \
-+ kde_icondir=\"$kde_icondir\" \
-+ kde_sounddir=\"$kde_sounddir\" \
-+ kde_datadir=\"$kde_datadir\" \
-+ kde_locale=\"$kde_locale\" \
-+ kde_cgidir=\"$kde_cgidir\" \
-+ kde_confdir=\"$kde_confdir\" \
-+ kde_kcfgdir=\"$kde_kcfgdir\" \
-+ kde_mimedir=\"$kde_mimedir\" \
-+ kde_toolbardir=\"$kde_toolbardir\" \
-+ kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+ kde_templatesdir=\"$kde_templatesdir\" \
-+ kde_bindir=\"$kde_bindir\" \
-+ kde_servicesdir=\"$kde_servicesdir\" \
-+ kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+ kde_moduledir=\"$kde_moduledir\" \
-+ kde_styledir=\"$kde_styledir\" \
-+ kde_widgetdir=\"$kde_widgetdir\" \
-+ xdg_appsdir=\"$xdg_appsdir\" \
-+ xdg_menudir=\"$xdg_menudir\" \
-+ xdg_directorydir=\"$xdg_directorydir\" \
-+ kde_result=$kde_result"
-+
-+
-+
-+ else
-+ { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+fi
-+
-+ eval "$kde_cv_all_paths"
-+ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+ test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+ test -z "$kde_datadir" || test -z "$kde_locale" ||
-+ test -z "$kde_cgidir" || test -z "$kde_confdir" ||
-+ test -z "$kde_kcfgdir" ||
-+ test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+ test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+ test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+ test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+ test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+ test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+ test "x$kde_have_all_paths" != "xyes"; then
-+ kde_have_all_paths=no
-+ fi
-+
-+ kde_result="$kde_result (cache overridden)"
-+fi
-+if test "$kde_have_all_paths" = "no"; then
-+ { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+" >&5
-+echo "$as_me: error: configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ rm -f conftest*
-+ echo "$as_me:$LINENO: result: $kde_result" >&5
-+echo "${ECHO_T}$kde_result" >&6
-+fi
-+
-+bindir=$kde_bindir
-+
-+
-+
-+# Check whether --with-arts or --without-arts was given.
-+if test "${with_arts+set}" = set; then
-+ withval="$with_arts"
-+ build_arts=$withval
-+else
-+ build_arts=yes
-+
-+fi;
-+
-+
-+if test "$build_arts" '!=' "no"; then
-+ include_ARTS_TRUE=
-+ include_ARTS_FALSE='#'
-+else
-+ include_ARTS_TRUE='#'
-+ include_ARTS_FALSE=
-+fi
-+
-+ if test "$build_arts" = "no"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITHOUT_ARTS 1
-+_ACEOF
-+
-+ fi
-+
-+
-+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+ test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-+ if test -n "$KDEDIRS"; then
-+ kde_save_IFS=$IFS
-+ IFS=:
-+ for dir in $KDEDIRS; do
-+ kde_default_bindirs="$dir/bin $kde_default_bindirs "
-+ done
-+ IFS=$kde_save_IFS
-+ fi
-+
-+ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+
-+ echo "$as_me:$LINENO: checking for dcopidl" >&5
-+echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
-+ if test -n "$DCOPIDL"; then
-+ kde_cv_path="$DCOPIDL";
-+ else
-+ kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/dcopidl"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/dcopidl 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/dcopidl"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/dcopidl"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidl was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DCOPIDL=$kde_cv_path
-+
-+ fi
-+
-+
-+ echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-+echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
-+ if test -n "$DCOPIDL2CPP"; then
-+ kde_cv_path="$DCOPIDL2CPP";
-+ else
-+ kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/dcopidl2cpp"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/dcopidl2cpp 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/dcopidl2cpp"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/dcopidl2cpp"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidl2cpp was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DCOPIDL2CPP=$kde_cv_path
-+
-+ fi
-+
-+ if test "$build_arts" '!=' "no"; then
-+
-+ echo "$as_me:$LINENO: checking for mcopidl" >&5
-+echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
-+ if test -n "$MCOPIDL"; then
-+ kde_cv_path="$MCOPIDL";
-+ else
-+ kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/mcopidl"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/mcopidl 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/mcopidl"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/mcopidl"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&5
-+echo "$as_me: error: The important program mcopidl was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MCOPIDL=$kde_cv_path
-+
-+ fi
-+
-+
-+ echo "$as_me:$LINENO: checking for artsc-config" >&5
-+echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-+ if test -n "$ARTSCCONFIG"; then
-+ kde_cv_path="$ARTSCCONFIG";
-+ else
-+ kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/artsc-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/artsc-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/artsc-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/artsc-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&5
-+echo "$as_me: error: The important program artsc-config was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ ARTSCCONFIG=$kde_cv_path
-+
-+ fi
-+
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for meinproc" >&5
-+echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
-+ if test -n "$MEINPROC"; then
-+ kde_cv_path="$MEINPROC";
-+ else
-+ kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/meinproc"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/meinproc 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/meinproc"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/meinproc"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MEINPROC=$kde_cv_path
-+
-+ fi
-+
-+
-+ kde32ornewer=1
-+ kde33ornewer=1
-+ if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-+ kde32ornewer=
-+ kde33ornewer=
-+ else
-+ if test "$kde_qtver" = "3"; then
-+ if test "$kde_qtsubver" -le 1; then
-+ kde32ornewer=
-+ fi
-+ if test "$kde_qtsubver" -le 2; then
-+ kde33ornewer=
-+ fi
-+ if test "$KDECONFIG" != "compiled"; then
-+ if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-+ kde33ornewer=
-+ fi
-+ fi
-+ fi
-+ fi
-+
-+ if test -n "$kde32ornewer"; then
-+
-+ echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-+echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
-+ if test -n "$KCONFIG_COMPILER"; then
-+ kde_cv_path="$KCONFIG_COMPILER";
-+ else
-+ kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/kconfig_compiler"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/kconfig_compiler 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/kconfig_compiler"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/kconfig_compiler"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program kconfig_compiler was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ KCONFIG_COMPILER=$kde_cv_path
-+
-+ fi
-+
-+
-+ echo "$as_me:$LINENO: checking for dcopidlng" >&5
-+echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
-+ if test -n "$DCOPIDLNG"; then
-+ kde_cv_path="$DCOPIDLNG";
-+ else
-+ kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/dcopidlng"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/dcopidlng 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/dcopidlng"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/dcopidlng"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program dcopidlng was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DCOPIDLNG=$kde_cv_path
-+
-+ fi
-+
-+ fi
-+ if test -n "$kde33ornewer"; then
-+
-+ echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-+echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
-+ if test -n "$MAKEKDEWIDGETS"; then
-+ kde_cv_path="$MAKEKDEWIDGETS";
-+ else
-+ kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$kde_default_bindirs $dirs"
-+ else dirs="$dirs $kde_default_bindirs"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/makekdewidgets"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/makekdewidgets 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/makekdewidgets"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/makekdewidgets"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
-+Please check whether you installed KDE correctly.
-+" >&5
-+echo "$as_me: error: The important program makekdewidgets was not found!
-+Please check whether you installed KDE correctly.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MAKEKDEWIDGETS=$kde_cv_path
-+
-+ fi
-+
-+
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+ if test -n "$XMLLINT"; then
-+ kde_cv_path="$XMLLINT";
-+ else
-+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xmllint"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xmllint 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ XMLLINT=""
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XMLLINT=$kde_cv_path
-+
-+ fi
-+
-+
-+ if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-+
-+KDE_XSL_STYLESHEET=NO
-+for i in $kde_sharedirs;
-+do
-+ for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-+ do
-+ echo "configure: 32093: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ KDE_XSL_STYLESHEET=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test "$KDE_XSL_STYLESHEET" = "NO"; then
-+ KDE_XSL_STYLESHEET=""
-+ else
-+ KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-+ fi
-+ fi
-+
-+ DCOP_DEPENDENCIES='$(DCOPIDL)'
-+ if test -n "$kde32ornewer"; then
-+ KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-+ DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-+
-+
-+
-+ fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+kdeinitdir='$(kde_moduledir)'
-+
-+
-+
-+if test "$kde_qtver" = 1; then
-+ kde_minidir="$kde_icondir/mini"
-+else
-+# for KDE 1 - this breaks KDE2 apps using minidir, but
-+# that's the plan ;-/
-+ kde_minidir="/dev/null"
-+fi
-+
-+
-+
-+
-+
-+
-+if test $kde_qtver = 3; then
-+ case $host in
-+ *cygwin*) lib_kded="-lkdeinit_kded" ;;
-+ *) lib_kded="" ;;
-+ esac
-+ LIB_KDED=$lib_kded
-+
-+ LIB_KDECORE="-lkdecore"
-+
-+ LIB_KDEUI="-lkdeui"
-+
-+ LIB_KIO="-lkio"
-+
-+ LIB_KJS="-lkjs"
-+
-+ LIB_SMB="-lsmb"
-+
-+ LIB_KAB="-lkab"
-+
-+ LIB_KABC="-lkabc"
-+
-+ LIB_KHTML="-lkhtml"
-+
-+ LIB_KSPELL="-lkspell"
-+
-+ LIB_KPARTS="-lkparts"
-+
-+ LIB_KDEPRINT="-lkdeprint"
-+
-+ LIB_KUTILS="-lkutils"
-+
-+ LIB_KDEPIM="-lkdepim"
-+
-+ LIB_KIMPROXY="-lkimproxy"
-+
-+ LIB_KNEWSTUFF="-lknewstuff"
-+
-+ LIB_KDNSSD="-lkdnssd"
-+
-+ LIB_KUNITTEST="-lkunittest"
-+
-+# these are for backward compatibility
-+ LIB_KSYCOCA="-lkio"
-+
-+ LIB_KFILE="-lkio"
-+
-+elif test $kde_qtver = 2; then
-+ LIB_KDECORE="-lkdecore"
-+
-+ LIB_KDEUI="-lkdeui"
-+
-+ LIB_KIO="-lkio"
-+
-+ LIB_KSYCOCA="-lksycoca"
-+
-+ LIB_SMB="-lsmb"
-+
-+ LIB_KFILE="-lkfile"
-+
-+ LIB_KAB="-lkab"
-+
-+ LIB_KHTML="-lkhtml"
-+
-+ LIB_KSPELL="-lkspell"
-+
-+ LIB_KPARTS="-lkparts"
-+
-+ LIB_KDEPRINT="-lkdeprint"
-+
-+else
-+ LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
-+
-+ LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
-+
-+ LIB_KFM="-lkfm $(LIB_KDECORE)"
-+
-+ LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-+
-+ LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
-+
-+fi
-+
-+
-+
-+#MIN_CONFIG(3.3)
-+
-+# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h
-+
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-+
-+
-+
-+
-+
-+for ac_header in unistd.h sys/param.h floatingpoint.h paths.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-+if test "${ac_cv_c_bigendian+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
-+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+ bogus endian macros
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_bigendian=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_c_bigendian=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+# It does not; compile a test program.
-+if test "$cross_compiling" = yes; then
-+ # try to guess the endianness by grepping values into an object file
-+ ac_cv_c_bigendian=unknown
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+int
-+main ()
-+{
-+ _ascii (); _ebcdic ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-+ ac_cv_c_bigendian=yes
-+fi
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
-+fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+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 ()
-+{
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long l;
-+ char c[sizeof (long)];
-+ } u;
-+ u.l = 1;
-+ exit (u.c[sizeof (long) - 1] == 1);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_bigendian=no
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_c_bigendian=yes
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+case $ac_cv_c_bigendian in
-+ yes)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+ ;;
-+ no)
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+echo "$as_me: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
-+
-+
-+echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
-+echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
-+if test "${ac_cv_maxpathlen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/param.h>
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+
-+KDE_HELLO MAXPATHLEN
-+
-+EOF
-+
-+ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-+
-+if { (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); } && test -s conftest.out; then
-+ ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-+else
-+ ac_cv_maxpathlen=1024
-+fi
-+
-+rm conftest.*
-+
-+
-+fi
-+
-+echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
-+echo "${ECHO_T}$ac_cv_maxpathlen" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDEMAXPATHLEN $ac_cv_maxpathlen
-+_ACEOF
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for Qt docs" >&5
-+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
-+kde_qtdir=
-+if test "${with_qt_dir+set}" = set; then
-+ kde_qtdir="$with_qt_dir"
-+fi
-+
-+
-+QTDOCDIR=NO
-+for i in $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ;
-+do
-+ for j in qsql.html;
-+ do
-+ echo "configure: 32695: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ QTDOCDIR=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-+echo "${ECHO_T}$QTDOCDIR" >&6
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for dot" >&5
-+echo $ECHO_N "checking for dot... $ECHO_C" >&6
-+ if test -n "$DOT"; then
-+ kde_cv_path="$DOT";
-+ else
-+ kde_cache=`echo dot | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs=" $dirs"
-+ else dirs="$dirs "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/dot"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/dot 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/dot"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/dot"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DOT=$kde_cv_path
-+
-+ fi
-+
-+if test -n "$DOT"; then
-+ KDE_HAVE_DOT="YES"
-+else
-+ KDE_HAVE_DOT="NO"
-+fi
-+
-+
-+ echo "$as_me:$LINENO: checking for doxygen" >&5
-+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
-+ if test -n "$DOXYGEN"; then
-+ kde_cv_path="$DOXYGEN";
-+ else
-+ kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs=" $dirs"
-+ else dirs="$dirs "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/doxygen"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/doxygen 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/doxygen"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/doxygen"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DOXYGEN=$kde_cv_path
-+
-+ fi
-+
-+
-+
-+DOXYGEN_PROJECT_NAME="The KOffice API Reference"
-+DOXYGEN_PROJECT_NUMBER="Version $VERSION"
-+
-+
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+ KDE_HAS_DOXYGEN=yes
-+fi
-+
-+
-+
-+
-+
-+# Check for ImageMagick...
-+
-+have_imagemagick=no
-+
-+ echo "$as_me:$LINENO: checking for Magick-config" >&5
-+echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6
-+ if test -n "$MAGICK_CONFIG"; then
-+ kde_cv_path="$MAGICK_CONFIG";
-+ else
-+ kde_cache=`echo Magick-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/Magick-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/Magick-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/Magick-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/Magick-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&5
-+echo "$as_me: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MAGICK_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$MAGICK_CONFIG"; then
-+ vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5005002
-+ then
-+ if test "$vers" -ge 6000003
-+ then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK6 1
-+_ACEOF
-+
-+ fi
-+ if test "$vers" -ge 6001000
-+ then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK61 1
-+_ACEOF
-+
-+ fi
-+ LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
-+ LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`"
-+ LIBMAGICK_RPATH=
-+ for args in $LIBMAGICK_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK 1
-+_ACEOF
-+
-+ have_imagemagick=yes
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least ImageMagick 5.5.2" >&5
-+echo "$as_me: WARNING: You need at least ImageMagick 5.5.2" >&2;}
-+ fi
-+fi
-+
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBMAGICK_RPATH=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test "$have_imagemagick" = "yes" -a HAVE_MAGICK61; then
-+ include_imagemagick_filter_TRUE=
-+ include_imagemagick_filter_FALSE='#'
-+else
-+ include_imagemagick_filter_TRUE='#'
-+ include_imagemagick_filter_FALSE=
-+fi
-+
-+
-+# End of ImageMagick check
-+
-+##########################################################################
-+# This last check is copied from kdenonbeta/gsf/configure.in.in
-+##########################################################################
-+# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+# also defines GSTUFF_PKG_ERRORS on error
-+# Note: This is specially tweaked for karbon's fontconfig check. Please fix
-+# it before using it for other tests :-)
-+
-+
-+# --- Check for KDE 3.2 or 3.3 ---
-+
-+echo "$as_me:$LINENO: checking for KDE version" >&5
-+echo $ECHO_N "checking for KDE version... $ECHO_C" >&6
-+
-+
-+
-+ 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'
-+
-+
-+kdeversion_save_CXXFLAGS="$CXXFLAGS"
-+kdeversion_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CXXFLAGS="$CXXFLAGS $all_includes"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
-+#error KDE 3.2
-+#endif
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ need_kde32_compat="no"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+need_kde32_compat="yes"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
-+#error KDE 3.3
-+#endif
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ need_kde33_compat="no"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+need_kde33_compat="yes"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
-+#error KDE 3.4
-+#endif
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ need_kde34_compat="no"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+need_kde34_compat="yes"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
-+#error KDE 3.5.x (x < 2)
-+#endif
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ need_kde351_compat="no"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+need_kde351_compat="yes"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+CXXFLAGS="$kdeversion_save_CXXFLAGS"
-+LIBS="$kdeversion_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+if test "$need_kde32_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
-+echo "${ECHO_T}KDE 3.2.x" >&6
-+else
-+ if test "$need_kde33_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
-+echo "${ECHO_T}KDE 3.3.x" >&6
-+ else
-+ if test "$need_kde34_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
-+echo "${ECHO_T}KDE 3.4.x" >&6
-+ else
-+ if test "$need_kde351_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
-+echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6
-+ else
-+ echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
-+echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6
-+ fi
-+ fi
-+ fi
-+fi
-+
-+
-+
-+if test "$need_kde32_compat" = "yes"; then
-+ need_kde32_compatibility_TRUE=
-+ need_kde32_compatibility_FALSE='#'
-+else
-+ need_kde32_compatibility_TRUE='#'
-+ need_kde32_compatibility_FALSE=
-+fi
-+
-+
-+
-+if test "$need_kde33_compat" = "yes"; then
-+ need_kde33_compatibility_TRUE=
-+ need_kde33_compatibility_FALSE='#'
-+else
-+ need_kde33_compatibility_TRUE='#'
-+ need_kde33_compatibility_FALSE=
-+fi
-+
-+
-+
-+if test "$need_kde34_compat" = "yes"; then
-+ need_kde34_compatibility_TRUE=
-+ need_kde34_compatibility_FALSE='#'
-+else
-+ need_kde34_compatibility_TRUE='#'
-+ need_kde34_compatibility_FALSE=
-+fi
-+
-+
-+
-+if test "$need_kde351_compat" = "yes"; then
-+ need_kde351_compatibility_TRUE=
-+ need_kde351_compatibility_FALSE='#'
-+else
-+ need_kde351_compatibility_TRUE='#'
-+ need_kde351_compatibility_FALSE=
-+fi
-+
-+
-+# Keep the old KDE 3.1 test, as long as it is still used
-+
-+
-+if test "supported" = "no"; then
-+ need_kde31_compatibility_TRUE=
-+ need_kde31_compatibility_FALSE='#'
-+else
-+ need_kde31_compatibility_TRUE='#'
-+ need_kde31_compatibility_FALSE=
-+fi
-+
-+
-+# --- End KDE 3.2 check ---
-+
-+# --- OpenEXR check ---
-+
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
-+echo "$as_me: WARNING: Could not find pkg-config" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+echo "$as_me:$LINENO: checking for OpenEXR" >&5
-+echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`"
-+ OPENEXR_RPATH=
-+ for args in $OPENEXR_LIBS; do
-+ case $args in
-+ -L*)
-+ OPENEXR_RPATH="$OPENEXR_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"`
-+ OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_OPENEXR 1
-+_ACEOF
-+
-+ fi
-+fi
-+
-+if test ! "$USE_RPATH" = "yes"; then
-+ OPENEXR_RPATH=
-+fi
-+
-+if test -n "$OPENEXR_LIBS"
-+then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$OPENEXR_LIBS"; then
-+ have_openexr_TRUE=
-+ have_openexr_FALSE='#'
-+else
-+ have_openexr_TRUE='#'
-+ have_openexr_FALSE=
-+fi
-+
-+
-+# --- End of OpenEXR check ---
-+
-+
-+DO_NOT_COMPILE="$DO_NOT_COMPILE example"
-+
-+# Check if the tiff lib is available
-+
-+
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libtiff tiff" >&5
-+echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6
-+
-+if test "${kde_cv_libtiff_tiff+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'
-+
-+
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lm"
-+fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include<tiffio.h>
-+
-+int
-+main ()
-+{
-+return (TIFFOpen( "", "r") == 0);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+ kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+ kde_cv_libtiff_tiff=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+if test "$kde_cv_libtiff_tiff" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBTIFF=""
-+
-+echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
-+echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6
-+
-+if test "${kde_cv_libtiff_tiff34+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'
-+
-+
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lm"
-+fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include<tiffio.h>
-+
-+int
-+main ()
-+{
-+return (TIFFOpen( "", "r") == 0);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+ kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+ kde_cv_libtiff_tiff34=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+if test "$kde_cv_libtiff_tiff34" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBTIFF=""
-+
-+else
-+ LIBTIFF="$kde_cv_libtiff_tiff34"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTIFF 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+else
-+ LIBTIFF="$kde_cv_libtiff_tiff"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTIFF 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBTIFF"; then
-+ have_tiff_TRUE=
-+ have_tiff_FALSE='#'
-+else
-+ have_tiff_TRUE='#'
-+ have_tiff_FALSE=
-+fi
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+fi
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include<png.h>
-+
-+int
-+main ()
-+{
-+
-+ png_structp png_ptr = png_create_read_struct( /* image ptr */
-+ PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+ return( png_ptr != 0 );
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_png=no"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPNG 1
-+_ACEOF
-+
-+ LIBPNG="$ac_cv_lib_png"
-+
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBPNG=""
-+
-+fi
-+
-+
-+
-+if test -n "$LIBPNG"; then
-+ have_png_TRUE=
-+ have_png_FALSE='#'
-+else
-+ have_png_TRUE='#'
-+ have_png_FALSE=
-+fi
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_jpeg_6b=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_6b"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+jpeg_CreateDecompress();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "ac_cv_lib_jpeg_normal=-ljpeg"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_jpeg_normal=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_normal"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+ LIBJPEG=
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+
-+jpeg_incdir=NO
-+for i in $jpeg_incdirs;
-+do
-+ for j in jpeglib.h;
-+ do
-+ echo "configure: 33906: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ jpeg_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBJPEG 1
-+_ACEOF
-+
-+else
-+ if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+ { echo "$as_me:$LINENO: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&5
-+echo "$as_me: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&2;}
-+ else
-+ { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-+echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-+ fi
-+ jpeg_incdir=
-+ LIBJPEG=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBJPEG"; then
-+ have_jpeg_TRUE=
-+ have_jpeg_FALSE='#'
-+else
-+ have_jpeg_TRUE='#'
-+ have_jpeg_FALSE=
-+fi
-+
-+
-+#---------------------------------------------------------
-+# libexif detection
-+# taken from libkexif's configure.in.in
-+#---------------------------------------------------------
-+
-+LIBEXIF=no
-+
-+#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, ,
-+# [ AC_MSG_WARN([libexif >= 0.5.7 not found.])
-+# LIBEXIF=yes ])
-+
-+
-+#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9,
-+# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]),
-+# AC_MSG_WARN([Using old version of libexif.]))
-+
-+
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
-+echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6
-+
-+ if $PKG_CONFIG --exists "libexif >= 0.6.12 " ; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ succeeded=yes
-+
-+ echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
-+echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6
-+ LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12 "`
-+ echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
-+echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6
-+
-+ echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
-+echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6
-+ LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12 "`
-+ echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
-+echo "${ECHO_T}$LIBEXIF_LIBS" >&6
-+ else
-+ LIBEXIF_CFLAGS=""
-+ LIBEXIF_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif >= 0.6.12 "`
-+
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ :
-+ else
-+ { echo "$as_me:$LINENO: WARNING: libexif >= 0.6.12 not found." >&5
-+echo "$as_me: WARNING: libexif >= 0.6.12 not found." >&2;}
-+ LIBEXIF=yes
-+ fi
-+
-+
-+
-+
-+
-+#---------------------------------------------------------
-+# libexif detection
-+#---------------------------------------------------------
-+echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
-+echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6
-+
-+
-+ 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'
-+
-+
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
-+if test "${exif_build+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. */
-+
-+ extern "C" {
-+#include <libexif/exif-loader.h>
-+#include <libexif/exif-utils.h>
-+}
-+
-+int
-+main ()
-+{
-+
-+ ExifLoader *l = exif_loader_new ();
-+ exif_loader_write_file (l,"kikoo");
-+ return 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ exif_build=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+exif_build=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+
-+echo "$as_me:$LINENO: result: $exif_build" >&5
-+echo "${ECHO_T}$exif_build" >&6
-+if test "$exif_build" = "no"; then
-+ LIBEXIF=""
-+fi
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+if test -n "$LIBEXIF"; then
-+ have_exif_TRUE=
-+ have_exif_FALSE='#'
-+else
-+ have_exif_TRUE='#'
-+ have_exif_FALSE=
-+fi
-+
-+
-+
-+if test -n "$LIBJPEG" -a -n "$LIBEXIF"; then
-+ include_jpeg_filter_TRUE=
-+ include_jpeg_filter_FALSE='#'
-+else
-+ include_jpeg_filter_TRUE='#'
-+ include_jpeg_filter_FALSE=
-+fi
-+
-+
-+
-+if test -n "$LIBTIFF" -a -n "$LIBEXIF"; then
-+ include_tiff_filter_TRUE=
-+ include_tiff_filter_FALSE='#'
-+else
-+ include_tiff_filter_TRUE='#'
-+ include_tiff_filter_FALSE=
-+fi
-+
-+
-+
-+# Check whether --with-libwv2 or --without-libwv2 was given.
-+if test "${with_libwv2+set}" = set; then
-+ withval="$with_libwv2"
-+
-+ if test "x$withval" != "xno" ; then
-+ if test "x$withval" != "xyes" ; then
-+ WV2_DIR=$withval
-+ fi
-+ search_for_wv2=yes
-+ else
-+ search_for_wv2=no
-+ fi
-+
-+else
-+ search_for_wv2=yes
-+
-+fi;
-+
-+if test $search_for_wv2 != no ; then
-+ if test -n "$WV2_DIR" ; then
-+
-+ echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+ if test -n "$WV2_CONFIG"; then
-+ kde_cv_path="$WV2_CONFIG";
-+ else
-+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$WV2_DIR/bin $dirs"
-+ else dirs="$dirs $WV2_DIR/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/wv2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/wv2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&5
-+echo "$as_me: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ WV2_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+ else
-+
-+ echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+ if test -n "$WV2_CONFIG"; then
-+ kde_cv_path="$WV2_CONFIG";
-+ else
-+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/wv2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/wv2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&5
-+echo "$as_me: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ WV2_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+ fi
-+fi
-+
-+if test -n "$WV2_CONFIG"; then
-+ vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1009
-+ then
-+ #LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-+ LIBWV2_LIBS="-lwv2"
-+ LIBWV2_RPATH=
-+ for args in $LIBWV2_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWV2_RPATH="$LIBWV2_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_WV2 1
-+_ACEOF
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least version 0.1.9 of libwv2" >&5
-+echo "$as_me: WARNING: You need at least version 0.1.9 of libwv2" >&2;}
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBWV2_LIBS"; then
-+ include_wv2_msword_filter_TRUE=
-+ include_wv2_msword_filter_FALSE='#'
-+else
-+ include_wv2_msword_filter_TRUE='#'
-+ include_wv2_msword_filter_FALSE=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+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`
-+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+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. */
-+#include <sys/types.h>
-+#include <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+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 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_search_opendir="none required"
-+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 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_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
-+ done
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+
-+fi
-+
-+else
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+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 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_search_opendir="none required"
-+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 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_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
-+ done
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+
-+fi
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_header_stdc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+ if test "$cross_compiling" = yes; then
-+ :
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ exit(2);
-+ exit (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+for ac_func in rewinddir popen mkstemp
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $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. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+# Check whether --enable-largefile or --disable-largefile was given.
-+if test "${enable_largefile+set}" = set; then
-+ enableval="$enable_largefile"
-+
-+fi;
-+if test "$enable_largefile" != no; then
-+
-+ echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_sys_largefile_CC=no
-+ if test "$GCC" != yes; then
-+ ac_save_CC=$CC
-+ while :; do
-+ # IRIX 6.2 and later do not support large files by default,
-+ # so use the C compiler's -n32 option if that helps.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext
-+ CC="$CC -n32"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sys_largefile_CC=' -n32'; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext
-+ break
-+ done
-+ CC=$ac_save_CC
-+ rm -f conftest.$ac_ext
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+ if test "$ac_cv_sys_largefile_CC" != no; then
-+ CC=$CC$ac_cv_sys_largefile_CC
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ while :; do
-+ ac_cv_sys_file_offset_bits=no
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ 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_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sys_file_offset_bits=64; 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_ext
-+ break
-+done
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_large_files+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ while :; do
-+ ac_cv_sys_large_files=no
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ 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_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sys_large_files=1; 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_ext
-+ break
-+done
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+if test "$ac_cv_sys_large_files" != no; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_largefile_source+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ while :; do
-+ ac_cv_sys_largefile_source=no
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+return !fseeko;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ 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_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _LARGEFILE_SOURCE 1
-+#include <stdio.h>
-+int
-+main ()
-+{
-+return !fseeko;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_sys_largefile_source=1; 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_ext
-+ break
-+done
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-+if test "$ac_cv_sys_largefile_source" != no; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+# 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.
-+echo "$as_me:$LINENO: checking for fseeko" >&5
-+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-+if test "${ac_cv_func_fseeko+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. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+return fseeko && fseeko (stdin, 0, 0);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_func_fseeko=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_fseeko=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
-+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-+if test $ac_cv_func_fseeko = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_FSEEKO 1
-+_ACEOF
-+
-+fi
-+
-+
-+for ac_func in fseek64
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $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. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+for ac_func in ftell64
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $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. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-+ 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'
-+
-+
-+
-+for ac_header in paper.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+ CPPFLAGS=$kde_safe_cppflags
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ kde_save_LDFLAGS="$LDFLAGS"
-+ kde_save_LIBS="$LIBS"
-+ LDFLAGS="$LDFLAGS $all_libraries"
-+ case $host_os in
-+ aix*) LDFLAGS="-brtl $LDFLAGS"
-+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+ ;;
-+ esac
-+ echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
-+echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6
-+if test "${ac_cv_lib_paper_paperinit+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpaper $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 paperinit ();
-+int
-+main ()
-+{
-+paperinit ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_paper_paperinit=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_paper_paperinit=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
-+echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6
-+if test $ac_cv_lib_paper_paperinit = yes; then
-+ LIBPAPER="-lpaper"
-+fi
-+
-+ LDFLAGS="$kde_save_LDFLAGS"
-+ LIBS="$kde_save_LIBS"
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
-+echo "$as_me: WARNING: Could not find pkg-config" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
-+ LIBWPD_RPATH=
-+ for args in $LIBWPD_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWPD_RPATH="$LIBWPD_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_WPD 1
-+_ACEOF
-+
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBWPD_LIBS"; then
-+ include_wpd_filter_TRUE=
-+ include_wpd_filter_FALSE='#'
-+else
-+ include_wpd_filter_TRUE='#'
-+ include_wpd_filter_FALSE=
-+fi
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for xml2-config" >&5
-+echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
-+ if test -n "$XML_CONFIG"; then
-+ kde_cv_path="$XML_CONFIG";
-+ else
-+ kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xml2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xml2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xml2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xml2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+ HELP_SUBDIR=
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XML_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$XML_CONFIG"; then
-+ vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2004008
-+ then
-+ LIBXML_LIBS="`$XML_CONFIG --libs`"
-+ LIBXML_RPATH=
-+ for args in $LIBXML_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXML_RPATH="$LIBXML_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+
-+
-+ echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+ if test -n "$XMLLINT"; then
-+ kde_cv_path="$XMLLINT";
-+ else
-+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xmllint"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xmllint 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ XMLLINT=""
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XMLLINT=$kde_cv_path
-+
-+ fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XMLLINT "$XMLLINT"
-+_ACEOF
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
-+echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
-+ HELP_SUBDIR=
-+ fi
-+fi
-+
-+
-+ echo "$as_me:$LINENO: checking for xslt-config" >&5
-+echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
-+ if test -n "$XSLT_CONFIG"; then
-+ kde_cv_path="$XSLT_CONFIG";
-+ else
-+ kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xslt-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xslt-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xslt-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xslt-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+ HELP_SUBDIR=
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XSLT_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$XSLT_CONFIG"; then
-+ vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000007; then
-+ LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-+ LIBXSLT_RPATH=
-+ for args in $LIBXSLT_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
-+echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
-+ HELP_SUBDIR=
-+ fi
-+fi
-+
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBXSLT_RPATH=
-+ LIBXML_RPATH=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS"; then
-+ include_XSLTFILTERS_TRUE=
-+ include_XSLTFILTERS_FALSE='#'
-+else
-+ include_XSLTFILTERS_TRUE='#'
-+ include_XSLTFILTERS_FALSE=
-+fi
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for freetype-config" >&5
-+echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
-+ if test -n "$FREETYPE_CONFIG"; then
-+ kde_cv_path="$FREETYPE_CONFIG";
-+ else
-+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/freetype-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/freetype-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/freetype-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/freetype-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
-+echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ FREETYPE_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$FREETYPE_CONFIG"; then
-+ vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5000000
-+ then
-+ LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-+ LIBFREETYPE_RPATH=
-+ for args in $LIBFREETYPE_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-+ 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;}
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for libart2-config" >&5
-+echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
-+ if test -n "$LIBART_CONFIG"; then
-+ kde_cv_path="$LIBART_CONFIG";
-+ else
-+ kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/libart2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/libart2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/libart2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/libart2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
-+echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ LIBART_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$LIBART_CONFIG"; then
-+ vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2003008
-+ then
-+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+ LIBART_RPATH=
-+ for args in $LIBART_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBART_RPATH="$LIBART_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBART 1
-+_ACEOF
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
-+echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+# Check for fontconfig
-+
-+ echo "$as_me:$LINENO: checking for fontconfig-config" >&5
-+echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
-+ if test -n "$FONTCONFIG_CONFIG"; then
-+ kde_cv_path="$FONTCONFIG_CONFIG";
-+ else
-+ kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/fontconfig-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/fontconfig-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/fontconfig-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/fontconfig-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
-+echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ FONTCONFIG_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
-+_ACEOF
-+
-+ fi
-+fi
-+
-+if test -n "$FONTCONFIG_CONFIG"; then
-+ vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
-+_ACEOF
-+
-+ fi
-+fi
-+
-+
-+
-+
-+
-+if test -z "$LIBART_LIBS"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
-+fi
-+
-+if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_KARBONTEXT 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for Readline library" >&5
-+echo $ECHO_N "checking for Readline library... $ECHO_C" >&6
-+
-+kexi_cv_lib_readline=no
-+ac_save_LIBS="$LIBS"
-+# Note: $LIBCURSES is permitted to be empty.
-+for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
-+do
-+ LIBS="$ac_save_LIBS $LIBREADLINE"
-+ if test "$cross_compiling" = yes; then
-+
-+ # action if cross compiling
-+ kexi_cv_lib_readline=no
-+
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ /* program */
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <readline/readline.h>
-+
-+main(int argc, char **argv)
-+{
-+ /* Note: don't actually call readline, since it may block;
-+ * We just want to see if it (dynamic) linked in okay.
-+ */
-+ if (argc == 0) /* never true */
-+ readline(0);
-+ exit(0);
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+ # action if true
-+ kexi_cv_lib_readline=yes
-+
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+
-+ # action if false
-+ kexi_cv_lib_readline=no
-+
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+ if test "$kexi_cv_lib_readline" = yes ; then break ; fi
-+done
-+# restore LIBS
-+LIBS="$ac_save_LIBS"
-+
-+if test "$kexi_cv_lib_readline" = no ; then
-+ LIBREADLINE=""
-+ echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
-+echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6
-+else
-+ echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
-+echo "${ECHO_T}$LIBREADLINE" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_READLINE 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+if test "$kexi_cv_lib_readline" = "yes"; then
-+ have_readline_TRUE=
-+ have_readline_FALSE='#'
-+else
-+ have_readline_TRUE='#'
-+ have_readline_FALSE=
-+fi
-+
-+
-+
-+
-+
-+#KEXI_VERSION=
-+LIB_KEXI_KMDI='-lkmdi'
-+
-+LIB_KEXI_KMDI_INCLUDES=''
-+
-+
-+
-+
-+# Check whether --enable-mysql or --disable-mysql was given.
-+if test "${enable_mysql+set}" = set; then
-+ enableval="$enable_mysql"
-+ mysql_plugin=$enableval
-+else
-+ mysql_plugin=yes
-+fi;
-+
-+if test "x$mysql_plugin" = "xyes"; then
-+ compile_mysql_plugin="yes"
-+else
-+ compile_mysql_plugin="no"
-+fi
-+
-+
-+# Check whether --with-mysql_includes or --without-mysql_includes was given.
-+if test "${with_mysql_includes+set}" = set; then
-+ withval="$with_mysql_includes"
-+
-+ ac_mysql_incdir=$withval
-+
-+else
-+ ac_mysql_incdir=
-+
-+fi;
-+
-+
-+# Check whether --with-mysql_libraries or --without-mysql_libraries was given.
-+if test "${with_mysql_libraries+set}" = set; then
-+ withval="$with_mysql_libraries"
-+
-+ ac_mysql_libdir=$withval
-+
-+else
-+ ac_mysql_libdir=
-+
-+fi;
-+
-+
-+echo "$as_me:$LINENO: checking for MySQL" >&5
-+echo $ECHO_N "checking for MySQL... $ECHO_C" >&6
-+
-+if test "$compile_mysql_plugin" = "yes"; then
-+ if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
-+ echo "$as_me:$LINENO: checking for MySQL headers" >&5
-+echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6
-+ mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
-+
-+mysql_incdir=NO
-+for i in $mysql_incdirs;
-+do
-+ for j in mysql/mysql.h;
-+ do
-+ echo "configure: 36901: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ mysql_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $mysql_incdir/mysql/mysql.h; then
-+ MYSQL_INC=$mysql_incdir
-+ echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
-+echo "${ECHO_T}$MYSQL_INC" >&6
-+
-+ else
-+ compile_mysql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for MySQL libraries" >&5
-+echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6
-+ mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+mysql_libdir=NO
-+for i in $mysql_libdirs;
-+do
-+ for j in mysql/libmysqlclient.so;
-+ do
-+ echo "configure: 36930: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ mysql_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $mysql_libdir/mysql/libmysqlclient.so; then
-+ MYSQL_LIBS=$mysql_libdir
-+ echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
-+echo "${ECHO_T}$MYSQL_LIBS" >&6
-+
-+ else
-+ compile_mysql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+ else
-+
-+ echo "$as_me:$LINENO: checking for mysql_config" >&5
-+echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6
-+ if test -n "$MYSQL_CONFIG"; then
-+ kde_cv_path="$MYSQL_CONFIG";
-+ else
-+ kde_cache=`echo mysql_config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/mysql_config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/mysql_config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/mysql_config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/mysql_config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MYSQL_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ if test -n "$MYSQL_CONFIG"; then
-+ mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1`
-+ mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
-+ MYSQL_INC=$mysql_incdir
-+ MYSQL_LIBS=$mysql_libdir
-+
-+
-+ compile_mypsql_plugin="yes"
-+ echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
-+echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6
-+ else
-+ compile_mysql_plugin="no"
-+ fi
-+ fi
-+else
-+ { echo "$as_me:$LINENO: Not attempting to configure MySQL as requested" >&5
-+echo "$as_me: Not attempting to configure MySQL as requested" >&6;}
-+fi
-+
-+
-+
-+if test "$compile_mysql_plugin" = "yes"; then
-+ compile_mysql_plugin_TRUE=
-+ compile_mysql_plugin_FALSE='#'
-+else
-+ compile_mysql_plugin_TRUE='#'
-+ compile_mysql_plugin_FALSE=
-+fi
-+
-+
-+
-+
-+# Check whether --enable-pgsql or --disable-pgsql was given.
-+if test "${enable_pgsql+set}" = set; then
-+ enableval="$enable_pgsql"
-+ pgsql_plugin=$enableval
-+else
-+ pgsql_plugin=yes
-+fi;
-+
-+if test "x$pgsql_plugin" = "xyes"; then
-+ compile_pgsql_plugin="yes"
-+else
-+ compile_pgsql_plugin="no"
-+fi
-+
-+
-+# Check whether --with-pgsql-includes or --without-pgsql-includes was given.
-+if test "${with_pgsql_includes+set}" = set; then
-+ withval="$with_pgsql_includes"
-+
-+ ac_pgsql_incdir=$withval
-+
-+else
-+ ac_pgsql_incdir=
-+
-+fi;
-+
-+
-+# Check whether --with-pgsql-libraries or --without-pgsql-libraries was given.
-+if test "${with_pgsql_libraries+set}" = set; then
-+ withval="$with_pgsql_libraries"
-+
-+ ac_pgsql_libdir=$withval
-+
-+else
-+ ac_pgsql_libdir=
-+
-+fi;
-+
-+
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
-+echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6
-+ pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
-+
-+pgsql_incdir=NO
-+for i in $pgsql_incdirs;
-+do
-+ for j in libpq-fe.h;
-+ do
-+ echo "configure: 37098: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pgsql_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pgsql_incdir/libpq-fe.h; then
-+ PG_INCDIR=$pgsql_incdir
-+ echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
-+echo "${ECHO_T}$PG_INCDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6
-+ pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+pgsql_libdir=NO
-+for i in $pgsql_libdirs;
-+do
-+ for j in libpq.so;
-+ do
-+ echo "configure: 37127: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pgsql_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pgsql_libdir/libpq.so; then
-+ PG_LIBDIR=$pgsql_libdir
-+ echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
-+echo "${ECHO_T}$PG_LIBDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+ else
-+
-+ echo "$as_me:$LINENO: checking for pg_config" >&5
-+echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
-+ if test -n "$PG_CONFIG"; then
-+ kde_cv_path="$PG_CONFIG";
-+ else
-+ kde_cache=`echo pg_config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/pg_config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pg_config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pg_config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pg_config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PG_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ if test -n "$PG_CONFIG"; then
-+ pgsql_incdir=`$PG_CONFIG --includedir`
-+ pgsql_libdir=`$PG_CONFIG --libdir`
-+ PG_INCDIR=$pgsql_incdir
-+ PG_LIBDIR=$pgsql_libdir
-+
-+ compile_pgsql_plugin="yes"
-+ echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
-+echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6
-+ else
-+ compile_pgsql_plugin="no"
-+ fi
-+ fi
-+else
-+ { echo "$as_me:$LINENO: Not attempting to configure PostgreSQL as requested" >&5
-+echo "$as_me: Not attempting to configure PostgreSQL as requested" >&6;}
-+fi
-+
-+
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ compile_pgsql_plugin_TRUE=
-+ compile_pgsql_plugin_FALSE='#'
-+else
-+ compile_pgsql_plugin_TRUE='#'
-+ compile_pgsql_plugin_FALSE=
-+fi
-+
-+
-+
-+
-+
-+# Check whether --with-pqxx-includes or --without-pqxx-includes was given.
-+if test "${with_pqxx_includes+set}" = set; then
-+ withval="$with_pqxx_includes"
-+
-+ ac_pqxx_incdir=$withval
-+
-+else
-+ ac_pqxx_incdir=
-+
-+fi;
-+
-+
-+# Check whether --with-pqxx-libraries or --without-pqxx-libraries was given.
-+if test "${with_pqxx_libraries+set}" = set; then
-+ withval="$with_pqxx_libraries"
-+
-+ ac_pqxx_libdir=$withval
-+
-+else
-+ ac_pqxx_libdir=
-+
-+fi;
-+
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6
-+ pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
-+
-+pqxx_incdir=NO
-+for i in $pqxx_incdirs;
-+do
-+ for j in pqxx/pqxx;
-+ do
-+ echo "configure: 37278: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pqxx_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pqxx_incdir/pqxx/pqxx; then
-+ PQXX_INCDIR=$pqxx_incdir
-+ echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
-+echo "${ECHO_T}$PQXX_INCDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+fi
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6
-+ pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+pqxx_libdir=NO
-+for i in $pqxx_libdirs;
-+do
-+ for j in libpqxx.so;
-+ do
-+ echo "configure: 37309: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pqxx_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pqxx_libdir/libpqxx.so; then
-+ PQXX_LIBDIR=$pqxx_libdir
-+ echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
-+echo "${ECHO_T}$PQXX_LIBDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+fi
-+
-+
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ compile_pgsql_plugin_TRUE=
-+ compile_pgsql_plugin_FALSE='#'
-+else
-+ compile_pgsql_plugin_TRUE='#'
-+ compile_pgsql_plugin_FALSE=
-+fi
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
-+echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6
-+
-+ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
-+knewstuff_libraries=""
-+knewstuff_includes=""
-+
-+if test "${ac_cv_have_knewstuff+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+knewstuff_incdir=NO
-+for i in $kde_incdirs;
-+do
-+ for j in knewstuff/downloaddialog.h;
-+ do
-+ echo "configure: 37360: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ knewstuff_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_knewstuff_includes="$knewstuff_incdir"
-+
-+
-+knewstuff_libdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in libknewstuff.so;
-+ do
-+ echo "configure: 37377: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ knewstuff_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_knewstuff_libraries="$knewstuff_libdir"
-+
-+if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
-+ ac_cv_have_knewstuff="have_knewstuff=no"
-+ ac_knewstuff_notfound=""
-+else
-+ have_knewstuff="yes"
-+fi
-+
-+fi
-+
-+
-+eval "$ac_cv_have_knewstuff"
-+
-+if test "$have_knewstuff" != yes; then
-+ echo "$as_me:$LINENO: result: $have_knewstuff" >&5
-+echo "${ECHO_T}$have_knewstuff" >&6
-+else
-+ echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
-+echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6
-+
-+ CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
-+
-+ LIB_KNEWSTUFF='-lknewstuff'
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
-+echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6
-+if test "${ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ test "$cross_compiling" = yes &&
-+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+ { (exit 1); exit 1; }; }
-+if test -r "kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp"; then
-+ ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=yes
-+else
-+ ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=no
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
-+echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6
-+if test $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp = yes; then
-+ have_internal_feedback="yes"
-+
-+else
-+ have_internal_feedback="no"
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
-+echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6
-+
-+ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
-+kfeedback_libraries=""
-+kfeedback_includes=""
-+
-+if test "${ac_cv_have_kfeedback+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+kfeedback_incdir=NO
-+for i in $kde_incdirs;
-+do
-+ for j in kfeedbackwizard.h;
-+ do
-+ echo "configure: 37456: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kfeedback_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_kfeedback_includes="$kfeedback_incdir"
-+
-+
-+kfeedback_libdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in libkfeedbackwizard.so;
-+ do
-+ echo "configure: 37473: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kfeedback_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ac_kfeedback_libraries="$kfeedback_libdir"
-+
-+if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then
-+ ac_cv_have_kfeedback="have_kfeedback=no"
-+ ac_kfeedback_notfound=""
-+else
-+ have_kfeedback="yes"
-+fi
-+
-+fi
-+
-+
-+eval "$ac_cv_have_kfeedback"
-+
-+INC_KFEEDBACK=''
-+LIB_KFEEDBACK=''
-+if test "$have_kfeedback" != yes; then
-+ if test "$have_internal_feedback" = yes; then
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
-+ use_kexifb="yes"
-+ echo "$as_me:$LINENO: result: using internal" >&5
-+echo "${ECHO_T}using internal" >&6
-+ INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
-+ LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
-+ else
-+ use_kexifb="no"
-+ echo "$as_me:$LINENO: result: dont use" >&5
-+echo "${ECHO_T}dont use" >&6
-+ fi
-+else
-+ use_kexifb="no"
-+ echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
-+echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6
-+
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
-+
-+ LIB_KFEEDBACK='-lkfeedbackwizard'
-+fi
-+
-+
-+
-+
-+if test "$use_kexifb" = "yes"; then
-+ use_kexifeedback_TRUE=
-+ use_kexifeedback_FALSE='#'
-+else
-+ use_kexifeedback_TRUE='#'
-+ use_kexifeedback_FALSE=
-+fi
-+
-+
-+# KexiMDB isn't built as part of Kexi right now.
-+#AC_ARG_ENABLE(keximdb,
-+# AC_HELP_STRING([--enable-keximdb],
-+# [build KexiMDB (MS Access) plugin [default=no]]),
-+# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no)
-+#
-+#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno")
-+
-+# Check whether --enable-kexi-reports or --disable-kexi-reports was given.
-+if test "${enable_kexi_reports+set}" = set; then
-+ enableval="$enable_kexi_reports"
-+ compile_kexi_reports_plugin=$enableval
-+else
-+ compile_kexi_reports_plugin=no
-+fi;
-+
-+
-+if test "x$compile_kexi_reports_plugin" != "xno"; then
-+ compile_kexi_reports_plugin_TRUE=
-+ compile_kexi_reports_plugin_FALSE='#'
-+else
-+ compile_kexi_reports_plugin_TRUE='#'
-+ compile_kexi_reports_plugin_FALSE=
-+fi
-+
-+
-+if test "$compile_kexi_reports_plugin" == "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define KEXI_REPORTS_SUPPORT 1
-+_ACEOF
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for Python directory" >&5
-+echo $ECHO_N "checking for Python directory... $ECHO_C" >&6
-+
-+if test "${kde_cv_pythondir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ if test -z "$PYTHONDIR"; then
-+ kde_cv_pythondir=/usr/local
-+ else
-+ kde_cv_pythondir="$PYTHONDIR"
-+ fi
-+
-+fi
-+
-+
-+
-+# Check whether --with-pythondir or --without-pythondir was given.
-+if test "${with_pythondir+set}" = set; then
-+ withval="$with_pythondir"
-+
-+ ac_python_dir=$withval
-+
-+else
-+ ac_python_dir=$kde_cv_pythondir
-+
-+fi;
-+
-+echo "$as_me:$LINENO: result: $ac_python_dir" >&5
-+echo "${ECHO_T}$ac_python_dir" >&6
-+
-+
-+
-+
-+
-+
-+
-+if test -z ""2.4""; then
-+ version="1.5"
-+else
-+ version=""2.4""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 37621: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 37637: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 37661: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 37677: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 37693: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 37721: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""2.3""; then
-+ version="1.5"
-+else
-+ version=""2.3""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 37765: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 37781: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 37805: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 37821: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 37837: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 37865: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""2.2""; then
-+ version="1.5"
-+else
-+ version=""2.2""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 37909: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 37925: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 37949: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 37965: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 37981: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 38009: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""2.1""; then
-+ version="1.5"
-+else
-+ version=""2.1""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 38053: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 38069: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 38093: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 38109: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 38125: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 38153: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""2.0""; then
-+ version="1.5"
-+else
-+ version=""2.0""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 38197: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 38213: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 38237: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 38253: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 38269: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 38297: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""; then
-+ version="1.5"
-+else
-+ version=""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 38341: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 38357: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 38381: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 38397: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 38413: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-+
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 38441: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+else
-+ kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_normal=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_tcl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_util=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_dl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-+
-+fi
-+
-+fi
-+
-+
-+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
-+fi
-+
-+
-+else
-+ kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_normal=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_tcl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_util=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_dl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-+
-+fi
-+
-+fi
-+
-+
-+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+else
-+ kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_normal=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_tcl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_util=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_dl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-+
-+fi
-+
-+fi
-+
-+
-+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+else
-+ kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_normal=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -20264,84 +42626,173 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-_ACEOF
+-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=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_lib_dl_dlopen=yes
-+ kde_cv_try_link_python_tcl=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_dl_dlopen=no
-+kde_cv_try_link_python_tcl=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
- else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
+-else
+-
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+fi
-
- fi
-
+-
+-fi
+-
- ;;
-
+-
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#include <Python.h>
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+int
-+main ()
-+{
-
+-
-#undef shl_load
-+ PySys_SetArgv(1, 0);
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -34973,185 +24128,67 @@
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-+ ;
-+ return 0;
- }
+-}
-#endif
-+_ACEOF
-+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=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-return f != shl_load;
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20367,28 +42818,62 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_func_shl_load=yes
-+ kde_cv_try_link_python_m_and_thread=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_func_shl_load=no
-+kde_cv_try_link_python_m_and_thread=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
- else
+-else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20396,17 +42881,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-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"
@@ -35159,117 +24196,79 @@
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shl_load ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-shl_load ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20432,74 +42914,173 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_lib_dld_shl_load=yes
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_dld_shl_load=no
-+kde_cv_try_link_python_m_and_thread_and_util=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
- else
+-else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#include <Python.h>
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+int
-+main ()
-+{
-
+-
-#undef dlopen
-+ PySys_SetArgv(1, 0);
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -35287,185 +24286,67 @@
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-+ ;
-+ return 0;
- }
+-}
-#endif
-+_ACEOF
-+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=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-return f != dlopen;
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20525,28 +43106,62 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_func_dlopen=yes
-+ kde_cv_try_link_python_pthread_and_db3=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_func_dlopen=no
-+kde_cv_try_link_python_pthread_and_db3=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
+-else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20554,17 +43169,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-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"
@@ -35473,97 +24354,65 @@
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-dlopen ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20590,29 +43202,62 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_lib_dl_dlopen=yes
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_dl_dlopen=no
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
- else
+-else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20620,17 +43265,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-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"
@@ -35571,97 +24420,65 @@
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-dlopen ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20656,29 +43298,62 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_lib_svld_dlopen=yes
-+ kde_cv_try_link_python_pthread_and_dl=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_svld_dlopen=no
-+kde_cv_try_link_python_pthread_and_dl=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
- else
+-else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -20686,17 +43361,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-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"
@@ -35669,34 +24486,44 @@
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-dld_link ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -20722,1552 +43394,1644 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_lib_dld_dld_link=yes
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_dld_dld_link=no
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -35708,31 +24535,18 @@
-
-fi
-
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
+-
-fi
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi
-
-
- fi
-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
- ;;
- esac
-
@@ -35746,14 +24560,13 @@
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
+-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
+-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+if test "$kde_python_link_found" = no; then
-
+-
- 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
@@ -35761,14 +24574,11 @@
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
+-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20788 "configure"
+-#line 20786 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -35849,27 +24659,24 @@
-rm -fr conftest*
-
-
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
- fi
+-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
+-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20886 "configure"
+-#line 20884 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -35877,7 +24684,7 @@
-#endif
-
-#include <stdio.h>
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -35887,13 +24694,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
+-
-/* 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
@@ -35915,50 +24716,31 @@
-# endif
-# endif
-#endif
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+#include <Python.h>
-
+-
-void fnord() { int i=42;}
-int main ()
-+int
-+main ()
- {
+-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+ PySys_SetArgv(1, 0);
-
+-
- exit (status);
-+ ;
-+ return 0;
- }
+-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
-+_ACEOF
-+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=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
@@ -35974,2392 +24756,425 @@
-fi
-rm -fr conftest*
-
--
--fi
++ 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
-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; }
+
- 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
--
--
--# 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
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
-- # See if we are running on zsh, and set the options which allow our commands through
-- # without removal of \ escapes.
-- if test -n "${ZSH_VERSION+set}" ; then
-- setopt NO_GLOB_SUBST
-- fi
-- # 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.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-- 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 \
-- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-- lt_cv_sys_global_symbol_to_c_name_address \
-- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-- old_postinstall_cmds old_postuninstall_cmds \
-- compiler_GCJ \
-- CC_GCJ \
-- LD_GCJ \
-- lt_prog_compiler_wl_GCJ \
-- lt_prog_compiler_pic_GCJ \
-- lt_prog_compiler_static_GCJ \
-- lt_prog_compiler_no_builtin_flag_GCJ \
-- export_dynamic_flag_spec_GCJ \
-- thread_safe_flag_spec_GCJ \
-- whole_archive_flag_spec_GCJ \
-- enable_shared_with_static_runtimes_GCJ \
-- old_archive_cmds_GCJ \
-- old_archive_from_new_cmds_GCJ \
-- predep_objects_GCJ \
-- postdep_objects_GCJ \
-- predeps_GCJ \
-- postdeps_GCJ \
-- compiler_lib_search_path_GCJ \
-- archive_cmds_GCJ \
-- archive_expsym_cmds_GCJ \
-- postinstall_cmds_GCJ \
-- postuninstall_cmds_GCJ \
-- old_archive_from_expsyms_cmds_GCJ \
-- allow_undefined_flag_GCJ \
-- no_undefined_flag_GCJ \
-- export_symbols_cmds_GCJ \
-- hardcode_libdir_flag_spec_GCJ \
-- hardcode_libdir_flag_spec_ld_GCJ \
-- hardcode_libdir_separator_GCJ \
-- hardcode_automatic_GCJ \
-- module_cmds_GCJ \
-- module_expsym_cmds_GCJ \
-- lt_cv_prog_compiler_c_o_GCJ \
-- exclude_expsyms_GCJ \
-- include_expsyms_GCJ; do
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++if test "$hardcode_action_GCJ" = relink; then
++ # Fast installation is not supported
++ enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
++ # Fast installation is not necessary
++ enable_fast_install=needless
+ fi
-- case $var in
-- old_archive_cmds_GCJ | \
-- old_archive_from_new_cmds_GCJ | \
-- archive_cmds_GCJ | \
-- archive_expsym_cmds_GCJ | \
-- module_cmds_GCJ | \
-- module_expsym_cmds_GCJ | \
-- old_archive_from_expsyms_cmds_GCJ | \
-- export_symbols_cmds_GCJ | \
-- extract_expsyms_cmds | reload_cmds | finish_cmds | \
-- postinstall_cmds | postuninstall_cmds | \
-- old_postinstall_cmds | old_postuninstall_cmds | \
-- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-- # Double-quote double-evaled strings.
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-- ;;
-- *)
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-- ;;
-- esac
-- done
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-- case $lt_echo in
-- *'\$0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-- ;;
-- esac
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+@@ -20998,7 +22712,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.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
+ 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 \
+@@ -21098,6 +22813,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
--cfgfile="$ofile"
-+fi
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21109,6 +22830,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
+@@ -21128,7 +22852,7 @@
+ NM=$lt_NM
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
-+fi
-
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
-+fi
-
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-
--# The host system.
--host_alias=$host_alias
--host=$host
-
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-
--# A C compiler.
--LTCC=$lt_LTCC
-
--# A language-specific compiler.
--CC=$lt_compiler_GCJ
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_GCJ
-+fi
-
--# An ERE matcher.
--EGREP=$lt_EGREP
-
--# The linker used to build libraries.
--LD=$lt_LD_GCJ
-
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
-+else
-+ kde_python_link_found=no
-
--# A BSD-compatible nm program.
--NM=$lt_NM
-+if test "$kde_python_link_found" = no; then
-
--# A symbol stripping program
+ # A symbol stripping program
-STRIP=$STRIP
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
++STRIP=$lt_STRIP
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -21159,7 +22883,7 @@
+ libext="$libext"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Used on cygwin: assembler.
--AS="$AS"
-+#include <Python.h>
-
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+int
-+main ()
-+{
-
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+ PySys_SetArgv(1, 0);
-
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_GCJ
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+kde_cv_try_link_python_normal=no
-
--# Old archive suffix (normally "a").
--libext="$libext"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# Shared library suffix (normally ".so").
+ # Shared library suffix (normally ".so").
-shrext='$shrext'
-+fi
++shrext_cmds='$shrext_cmds'
--# Executable file suffix (normally "").
--exeext="$exeext"
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21174,7 +22898,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_GCJ
--pic_mode=$pic_mode
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+fi
-
-# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+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
-
--# Do we need a version for libraries?
--need_version=$need_version
-
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+if test "$kde_python_link_found" = no; then
-
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_GCJ
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-+#include <Python.h>
-
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+int
-+main ()
-+{
-
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+ PySys_SetArgv(1, 0);
-
--# Library versioning type.
--version_type=$version_type
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+kde_cv_try_link_python_m=no
-
--# 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
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+fi
-
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_GCJ
--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_GCJ
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
+ # Do we need the lib prefix for modules?
+@@ -21376,7 +23100,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.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
+ fi
+ fi
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_GCJ
--archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+fi
+@@ -21396,7 +23123,6 @@
+ RC)
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_GCJ
--module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+fi
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_GCJ
+@@ -21415,15 +23141,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_GCJ
-+if test "$kde_python_link_found" = no; then
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_GCJ
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_GCJ
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+#include <Python.h>
-
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+int
-+main ()
-+{
-
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_GCJ
-+ PySys_SetArgv(1, 0);
-
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+kde_cv_try_link_python_pthread=no
-
--# 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
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+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
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
+
-+fi
+
-+fi
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ lt_cv_prog_compiler_c_o_RC=yes
+
+ # The else clause should only fire when bootstrapping the
+@@ -21439,7 +23192,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.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
+ 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 \
+@@ -21539,6 +23293,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+kde_cv_try_link_python_tcl=no
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21550,6 +23310,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_GCJ
-+fi
-
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-+fi
-
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_GCJ
-+fi
-
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_GCJ
-
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_GCJ
-+if test "$kde_python_link_found" = no; then
-
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_GCJ
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+#include <Python.h>
-
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_GCJ
-+int
-+main ()
-+{
-
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+ PySys_SetArgv(1, 0);
-
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_GCJ
-+kde_cv_try_link_python_db2=no
-
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_GCJ
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# ### END LIBTOOL TAG CONFIG: $tagname
-+fi
-
--__EOF__
-
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-
- else
-- # 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.
-- test -f Makefile && make "$ltmain"
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+
- fi
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
-+fi
+@@ -21569,7 +23332,7 @@
+ NM=$lt_NM
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--CC="$lt_save_CC"
-
-- else
-- tagname=""
-- fi
-- ;;
-+if test "$kde_python_link_found" = no; then
-
-- RC)
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Source file extension for RC test sources.
--ac_ext=rc
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Object file extension for compiled RC test sources.
--objext=o
--objext_RC=$objext
-+#include <Python.h>
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+int
-+main ()
-+{
-
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
-+ PySys_SetArgv(1, 0);
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+kde_cv_try_link_python_m_and_thread=no
-
--# Allow CC to be a program name with arguments.
--compiler=$CC
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--compiler_RC=$CC
--lt_cv_prog_compiler_c_o_RC=yes
-
--# 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
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
-- # See if we are running on zsh, and set the options which allow our commands through
-- # without removal of \ escapes.
-- if test -n "${ZSH_VERSION+set}" ; then
-- setopt NO_GLOB_SUBST
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
- fi
-- # 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.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-- 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 \
-- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-- lt_cv_sys_global_symbol_to_c_name_address \
-- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-- old_postinstall_cmds old_postuninstall_cmds \
-- compiler_RC \
-- CC_RC \
-- LD_RC \
-- lt_prog_compiler_wl_RC \
-- lt_prog_compiler_pic_RC \
-- lt_prog_compiler_static_RC \
-- lt_prog_compiler_no_builtin_flag_RC \
-- export_dynamic_flag_spec_RC \
-- thread_safe_flag_spec_RC \
-- whole_archive_flag_spec_RC \
-- enable_shared_with_static_runtimes_RC \
-- old_archive_cmds_RC \
-- old_archive_from_new_cmds_RC \
-- predep_objects_RC \
-- postdep_objects_RC \
-- predeps_RC \
-- postdeps_RC \
-- compiler_lib_search_path_RC \
-- archive_cmds_RC \
-- archive_expsym_cmds_RC \
-- postinstall_cmds_RC \
-- postuninstall_cmds_RC \
-- old_archive_from_expsyms_cmds_RC \
-- allow_undefined_flag_RC \
-- no_undefined_flag_RC \
-- export_symbols_cmds_RC \
-- hardcode_libdir_flag_spec_RC \
-- hardcode_libdir_flag_spec_ld_RC \
-- hardcode_libdir_separator_RC \
-- hardcode_automatic_RC \
-- module_cmds_RC \
-- module_expsym_cmds_RC \
-- lt_cv_prog_compiler_c_o_RC \
-- exclude_expsyms_RC \
-- include_expsyms_RC; do
--
-- case $var in
-- old_archive_cmds_RC | \
-- old_archive_from_new_cmds_RC | \
-- archive_cmds_RC | \
-- archive_expsym_cmds_RC | \
-- module_cmds_RC | \
-- module_expsym_cmds_RC | \
-- old_archive_from_expsyms_cmds_RC | \
-- export_symbols_cmds_RC | \
-- extract_expsyms_cmds | reload_cmds | finish_cmds | \
-- postinstall_cmds | postuninstall_cmds | \
-- old_postinstall_cmds | old_postuninstall_cmds | \
-- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-- # Double-quote double-evaled strings.
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-- ;;
-- *)
-- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-- ;;
-- esac
-- done
-
-- case $lt_echo in
-- *'\$0 --fallback-echo"')
-- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-- ;;
-- esac
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--cfgfile="$ofile"
-+fi
-
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+fi
-
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
-+if test "$kde_python_link_found" = no; then
-
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_RC
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# The host system.
--host_alias=$host_alias
--host=$host
-+#include <Python.h>
-
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-+int
-+main ()
-+{
-
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+ PySys_SetArgv(1, 0);
-
--# A C compiler.
--LTCC=$lt_LTCC
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# A language-specific compiler.
--CC=$lt_compiler_RC
-+kde_cv_try_link_python_m_and_thread_and_util=no
-
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_RC
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# An ERE matcher.
--EGREP=$lt_EGREP
-+fi
-
--# The linker used to build libraries.
--LD=$lt_LD_RC
-
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-
--# A BSD-compatible nm program.
--NM=$lt_NM
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# A symbol stripping program
+ # A symbol stripping program
-STRIP=$STRIP
-+fi
++STRIP=$lt_STRIP
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-+fi
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -21600,7 +23363,7 @@
+ libext="$libext"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
-
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-
--# Used on cygwin: assembler.
--AS="$AS"
-+if test "$kde_python_link_found" = no; then
-
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_RC
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Old archive suffix (normally "a").
--libext="$libext"
-+#include <Python.h>
-
--# Shared library suffix (normally ".so").
+ # Shared library suffix (normally ".so").
-shrext='$shrext'
-+int
-+main ()
-+{
++shrext_cmds='$shrext_cmds'
--# Executable file suffix (normally "").
--exeext="$exeext"
-+ PySys_SetArgv(1, 0);
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21615,7 +23378,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_RC
--pic_mode=$pic_mode
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+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
-
--# Do we need a version for libraries?
--need_version=$need_version
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ # Do we need the lib prefix for modules?
+@@ -21817,7 +23580,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.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
+ fi
-
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
-+fi
-
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+fi
-
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_RC
-
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+if test "$kde_python_link_found" = no; then
-
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Library versioning type.
--version_type=$version_type
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# 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
-+#include <Python.h>
-
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+int
-+main ()
-+{
-
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_RC
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+ PySys_SetArgv(1, 0);
-
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+kde_cv_try_link_python_pthread_and_db3=no
-
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_RC
--archive_expsym_cmds=$lt_archive_expsym_cmds_RC
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_RC
--module_expsym_cmds=$lt_module_expsym_cmds_RC
-+fi
-
--# 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_RC
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_RC
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_RC
-+fi
-
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_RC
-+fi
-
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
--# 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
-+if test "$kde_python_link_found" = no; then
-
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_RC
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_RC
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# 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
-+#include <Python.h>
-
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+int
-+main ()
-+{
-
--# 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
-+ PySys_SetArgv(1, 0);
-
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+kde_cv_try_link_python_m_and_thread_and_db=no
-
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_RC
-+fi
-
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-+fi
-
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_RC
-+fi
-
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_RC
-
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_RC
-+if test "$kde_python_link_found" = no; then
-
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_RC
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+#include <Python.h>
-
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_RC
-+int
-+main ()
-+{
-
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_RC
-+ PySys_SetArgv(1, 0);
-
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_RC
-+kde_cv_try_link_python_pthread_and_dl=no
-
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_RC
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--# ### END LIBTOOL TAG CONFIG: $tagname
-+fi
-
--__EOF__
-
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-
- else
-- # 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.
-- test -f Makefile && make "$ltmain"
--fi
--
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+fi
-
--CC="$lt_save_CC"
-+fi
-
-- ;;
-
-- *)
-- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-- { (exit 1); exit 1; }; }
-- ;;
-- esac
-
-- # Append the new tag name to the list of available tags.
-- if test -n "$tagname" ; then
-- available_tags="$available_tags $tagname"
-- fi
-- fi
-- done
-- IFS="$lt_save_ifs"
-+if test "$kde_python_link_found" = no; then
-
-- # Now substitute the updated list of available tags.
-- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-- mv "${ofile}T" "$ofile"
-- chmod +x "$ofile"
-- else
-- rm -f "${ofile}T"
-- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
fi
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -21864,7 +23630,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Always use our own libtool.
+ # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-+#include <Python.h>
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--# Prevent multiple expansion
-+int
-+main ()
-+{
+ # Prevent multiple expansion
-+ PySys_SetArgv(1, 0);
+@@ -21919,8 +23685,8 @@
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-
-+fi
-
-+fi
-
-
-
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-
-
--LIBTOOL_SHELL="/bin/sh ./libtool"
--# LIBTOOL="$LIBTOOL --silent"
--KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-
-
--# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
--KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-
--# we patch configure quite some so we better keep that consistent for incremental runs
--AUTOCONF='$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure'
-+fi
-
-
-
-+else
-+ kde_python_link_found=no
-
-+if test "$kde_python_link_found" = no; then
-
-- # Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case "$MSGFMT" in
-- /*)
-- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"; then
-- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-- ;;
--esac
--fi
--MSGFMT="$ac_cv_path_MSGFMT"
--if test -n "$MSGFMT"; then
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -21946,17 +23712,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
fi
-- # Extract the first word of "gmsgfmt", so it can be a program name with args.
--set dummy gmsgfmt; ac_word=$2
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- case $GMSGFMT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- 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
+@@ -21971,32 +23737,33 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
-
-- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-- ;;
--esac
--fi
--GMSGFMT=$ac_cv_path_GMSGFMT
-
--if test -n "$GMSGFMT"; then
+ if test -n "$GMSGFMT"; then
- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
--else
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-- if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
++
+ if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-- GMSGFMT=":"
-- fi
-- MSGFMT=$GMSGFMT
-+#include <Python.h>
++ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+ GMSGFMT=":"
+ fi
+ MSGFMT=$GMSGFMT
+@@ -22005,8 +23772,8 @@
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-- # Extract the first word of "xgettext", so it can be a program name with args.
--set dummy xgettext; ac_word=$2
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case "$XGETTEXT" in
-- /*)
-- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-- ;;
--esac
--fi
--XGETTEXT="$ac_cv_path_XGETTEXT"
--if test -n "$XGETTEXT"; then
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22032,11 +23799,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
--
-- if test "$XGETTEXT" != ":"; then
-- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-- : ;
-- else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+@@ -22044,8 +23811,8 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
- echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
-- XGETTEXT=":"
-- fi
-- fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+@@ -22139,8 +23906,7 @@
-+kde_cv_try_link_python_normal=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+fi
-
-
--if test -z "3.3"; then
-- # Current default Qt version: 3.3
-- kde_qtver=3
-- kde_qtsubver=3
--else
-- kde_qtsubver=`echo "3.3" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-- # following is the check if subversion isnt found in passed argument
-- if test "$kde_qtsubver" = "3.3"; then
-- kde_qtsubver=1
-- fi
-- kde_qtver=`echo "3.3" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-- if test "$kde_qtver" = "1"; then
-- kde_qtsubver=42
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
- fi
--fi
-
--if test -z ""; then
-- if test "$kde_qtver" = "2"; then
-- if test $kde_qtsubver -gt 0; then
-- kde_qt_minversion=">= Qt 2.2.2"
-- else
-- kde_qt_minversion=">= Qt 2.0.2"
-- fi
-- fi
-- if test "$kde_qtver" = "3"; then
-- if test $kde_qtsubver -gt 0; then
-- if test $kde_qtsubver -gt 1; then
-- if test $kde_qtsubver -gt 2; then
-- kde_qt_minversion=">= Qt 3.3 and < 4.0"
-- else
-- kde_qt_minversion=">= Qt 3.2 and < 4.0"
-- fi
-- else
-- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
-- fi
-- else
-- kde_qt_minversion=">= Qt 3.0 and < 4.0"
-- fi
-- fi
-- if test "$kde_qtver" = "1"; then
-- kde_qt_minversion=">= 1.42 and < 2.0"
-- fi
- else
-- kde_qt_minversion=""
--fi
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--if test -z ""; then
-- if test $kde_qtver = 3; then
-- if test $kde_qtsubver -gt 0; then
-- kde_qt_verstring="QT_VERSION >= 0x03 at VER@00 && QT_VERSION < 0x040000"
-- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s, at VER@,$qtsubver,"`
-- else
-- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
-- fi
-- fi
-- if test $kde_qtver = 2; then
-- if test $kde_qtsubver -gt 0; then
-- kde_qt_verstring="QT_VERSION >= 222"
-- else
-- kde_qt_verstring="QT_VERSION >= 200"
-- fi
-- fi
-- if test $kde_qtver = 1; then
-- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-- fi
--else
-- kde_qt_verstring=""
- fi
-
--if test $kde_qtver = 4; then
-- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
--fi
--if test $kde_qtver = 3; then
-- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
- fi
--if test $kde_qtver = 2; then
-- kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
--fi
--if test $kde_qtver = 1; then
-- kde_qt_dirs="$QTDIR /usr/lib/qt"
--fi
-
--
-
-
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ 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'
+@@ -22152,8 +23918,8 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+if test "$kde_python_link_found" = no; then
-
-- ac_save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-
- echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
-- if test "${kde_cv_stl_works+set}" = set; then
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++ { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+ if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
-- cat >conftest.$ac_ext <<_ACEOF
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#include <string>
--using namespace std;
-+#include <Python.h>
-
- int
- main ()
- {
-
-- string astring="Hallo Welt.";
-- astring.erase(0, 6); // now astring is "Welt"
-- return 0;
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
+@@ -22181,23 +23947,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -38367,151 +25182,92 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- kde_cv_stl_works=yes
-+ kde_cv_try_link_python_m=yes
- else
+@@ -22206,15 +23985,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_stl_works=no
-+kde_cv_try_link_python_m=no
++ kde_cv_stl_works=no
+ fi
+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-echo "${ECHO_T}$kde_cv_stl_works" >&6
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
++ { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
-- if test "$kde_cv_stl_works" = "yes"; then
-- # back compatible
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ if test "$kde_cv_stl_works" = "yes"; then
+ # back compatible
+@@ -22243,15 +24023,14 @@
--cat >>confdefs.h <<_ACEOF
--#define HAVE_SGI_STL 1
--_ACEOF
-+fi
-- else
-- { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
--Check config.log for details - if you're using a Linux distribution you might miss
--a package named similar to libstdc++-dev." >&5
--echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
--Check config.log for details - if you're using a Linux distribution you might miss
--a package named similar to libstdc++-dev." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-+fi
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-
-echo "$as_me:$LINENO: checking for strlcat" >&5
-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
--if test "${kde_cv_func_strlcat+set}" = set; then
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- 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'
--
--
--save_CXXFLAGS="$CXXFLAGS"
--kde_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
++ 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'
+@@ -22263,9 +24042,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22275,122 +45039,109 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--
--#include <string.h>
--
-+#include <Python.h>
-
- int
- main ()
- {
-
-- char buf[20];
-- buf[0]='\0';
-- strlcat(buf, "KDE function test", sizeof(buf));
--
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
+@@ -22291,23 +24067,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -38519,283 +25275,176 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- kde_cv_func_strlcat=yes
-+ kde_cv_try_link_python_pthread=yes
- else
+@@ -22316,8 +24105,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcat=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--CXXFLAGS="$save_CXXFLAGS"
--LIBS="$kde_safe_LIBS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+kde_cv_try_link_python_pthread=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
++ kde_cv_func_strlcat=no
fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22331,11 +24121,11 @@
+ fi
-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
--if test "${kde_cv_proto_strlcat+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+@@ -22356,8 +24146,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
--if test "x$kde_cv_func_strlcat" = xyes; then
-- kde_cv_proto_strlcat=no
--else
-- case "strlcat" in
-- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-- kde_cv_proto_strlcat="yes - in libkdefakes"
-- ;;
-- *)
-- kde_cv_proto_strlcat=unknown
-- ;;
-- esac
- fi
--if test "x$kde_cv_proto_strlcat" = xunknown; then
-+fi
-
-
-
+-
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test "$kde_python_link_found" = no; then
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- kde_safe_libs=$LIBS
-- LIBS="$LIBS $X_EXTRA_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
++ 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'
+@@ -22395,23 +24184,36 @@
+ }
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--
--#include <string.h>
--
--
--extern "C" unsigned long strlcat(char*, const char*, unsigned long);
-+#include <Python.h>
-
- int
- main ()
- {
-
-- char buf[20];
-- buf[0]='\0';
-- strlcat(buf, "KDE function test", sizeof(buf));
--
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
-@@ -22405,7 +45156,7 @@
+ 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'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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=$?
-@@ -22417,76 +45168,62 @@
+ 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
-- kde_cv_func_strlcat=yes
-- kde_cv_proto_strlcat=yes
-+ kde_cv_try_link_python_tcl=yes
- else
+@@ -22421,9 +24223,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_proto_strlcat="strlcat unavailable"
-+kde_cv_try_link_python_tcl=no
++ kde_cv_proto_strlcat="strlcat unavailable"
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$kde_safe_libs
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--fi
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS=$kde_safe_libs
+@@ -22437,8 +24240,8 @@
fi
-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
--
--if test "x$kde_cv_func_strlcat" = xyes; then
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRLCAT 1
--_ACEOF
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
+ if test "x$kde_cv_func_strlcat" = xyes; then
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+@@ -22462,15 +24265,14 @@
- fi
--if test "x$kde_cv_proto_strlcat" = xno; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRLCAT_PROTO 1
--_ACEOF
- fi
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-
--
--
-echo "$as_me:$LINENO: checking for strlcpy" >&5
-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
--if test "${kde_cv_func_strlcpy+set}" = set; then
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- 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'
--
--
--save_CXXFLAGS="$CXXFLAGS"
--kde_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
++ 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'
+@@ -22482,9 +24284,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22494,120 +45231,109 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--
--#include <string.h>
--
-+#include <Python.h>
-
- int
- main ()
- {
-
-- char buf[20];
-- strlcpy(buf, "KDE function test", sizeof(buf));
--
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
+@@ -22509,23 +24308,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -38803,662 +25452,505 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- kde_cv_func_strlcpy=yes
-+ kde_cv_try_link_python_db2=yes
- else
+@@ -22534,8 +24346,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcpy=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--CXXFLAGS="$save_CXXFLAGS"
--LIBS="$kde_safe_LIBS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+kde_cv_try_link_python_db2=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
++ kde_cv_func_strlcpy=no
fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22549,11 +24362,11 @@
+ fi
-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
--if test "${kde_cv_proto_strlcpy+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+@@ -22574,8 +24387,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
--if test "x$kde_cv_func_strlcpy" = xyes; then
-- kde_cv_proto_strlcpy=no
--else
-- case "strlcpy" in
-- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-- kde_cv_proto_strlcpy="yes - in libkdefakes"
-- ;;
-- *)
-- kde_cv_proto_strlcpy=unknown
-- ;;
-- esac
- fi
--if test "x$kde_cv_proto_strlcpy" = xunknown; then
-+fi
-
-
-
+-
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test "$kde_python_link_found" = no; then
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- kde_safe_libs=$LIBS
-- LIBS="$LIBS $X_EXTRA_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
++ 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'
+@@ -22612,23 +24424,36 @@
+ }
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--
--#include <string.h>
--
--
--extern "C" unsigned long strlcpy(char*, const char*, unsigned long);
-+#include <Python.h>
-
- int
- main ()
- {
-
-- char buf[20];
-- strlcpy(buf, "KDE function test", sizeof(buf));
--
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
-@@ -22622,7 +45348,7 @@
+ 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'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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=$?
-@@ -22634,59 +45360,62 @@
+ 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
-- kde_cv_func_strlcpy=yes
-- kde_cv_proto_strlcpy=yes
-+ kde_cv_try_link_python_m_and_thread=yes
- else
+@@ -22638,9 +24463,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_proto_strlcpy="strlcpy unavailable"
-+kde_cv_try_link_python_m_and_thread=no
++ kde_cv_proto_strlcpy="strlcpy unavailable"
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$kde_safe_libs
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--fi
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS=$kde_safe_libs
+@@ -22654,8 +24480,8 @@
fi
-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
--
--if test "x$kde_cv_func_strlcpy" = xyes; then
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRLCPY 1
--_ACEOF
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
+ if test "x$kde_cv_func_strlcpy" = xyes; then
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+@@ -22678,8 +24504,8 @@
- fi
--if test "x$kde_cv_proto_strlcpy" = xno; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRLCPY_PROTO 1
--_ACEOF
- fi
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-
--
- echo "$as_me:$LINENO: checking for main in -lutil" >&5
-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
--if test "${ac_cv_lib_util_main+set}" = set; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
++ { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lutil $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22694,11 +45423,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#include <Python.h>
-
+@@ -22696,29 +24522,42 @@
int
main ()
{
-main ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return main ();
;
return 0;
}
-@@ -22724,30 +45456,62 @@
+ _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
-- ac_cv_lib_util_main=yes
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
+@@ -22727,20 +24566,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_util_main=no
-+kde_cv_try_link_python_m_and_thread_and_util=no
++ ac_cv_lib_util_main=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
--if test $ac_cv_lib_util_main = yes; then
-- LIBUTIL="-lutil"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+ LIBUTIL="-lutil"
fi
- echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
--if test "${ac_cv_lib_compat_main+set}" = set; then
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
++ { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcompat $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22755,11 +45519,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#include <Python.h>
-
+@@ -22757,29 +24597,42 @@
int
main ()
{
-main ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return main ();
;
return 0;
}
-@@ -22785,31 +45552,62 @@
+ _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
-- ac_cv_lib_compat_main=yes
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
- else
+@@ -22788,21 +24641,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
-+kde_cv_try_link_python_m_and_thread_and_db3=no
++ ac_cv_lib_compat_main=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
--if test $ac_cv_lib_compat_main = yes; then
-- LIBCOMPAT="-lcompat"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+ LIBCOMPAT="-lcompat"
fi
-- kde_have_crypt=
+ kde_have_crypt=
- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
--if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
++ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcrypt $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22817,17 +45615,14 @@
+@@ -22815,39 +24669,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char crypt ();
-+#include <Python.h>
-+
+ char crypt ();
int
main ()
{
-crypt ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return crypt ();
;
return 0;
}
-@@ -22853,29 +45648,62 @@
+ _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
-- ac_cv_lib_crypt_crypt=yes
-+ kde_cv_try_link_python_pthread_and_db3=yes
- else
+@@ -22856,19 +24723,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
-+kde_cv_try_link_python_pthread_and_db3=no
++ ac_cv_lib_crypt_crypt=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
--if test $ac_cv_lib_crypt_crypt = yes; then
-- LIBCRYPT="-lcrypt"; kde_have_crypt=yes
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+ LIBCRYPT="-lcrypt"; kde_have_crypt=yes
else
- echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
--if test "${ac_cv_lib_c_crypt+set}" = set; then
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++ { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lc $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22883,17 +45711,14 @@
+@@ -22881,39 +24749,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char crypt ();
-+#include <Python.h>
-+
+ char crypt ();
int
main ()
{
-crypt ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return crypt ();
;
return 0;
}
-@@ -22919,218 +45744,254 @@
+ _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
-- ac_cv_lib_c_crypt=yes
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
- else
+@@ -22922,14 +24803,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_crypt=no
-+kde_cv_try_link_python_m_and_thread_and_db=no
++ ac_cv_lib_c_crypt=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
--if test $ac_cv_lib_c_crypt = yes; then
-- kde_have_crypt=yes
--else
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+ kde_have_crypt=yes
+ else
+@@ -22955,13 +24837,13 @@
-- { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
--You should install libcrypt from another source or configure with PAM
--support" >&5
--echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
--You should install libcrypt from another source or configure with PAM
--support" >&2;}
-- kde_have_crypt=no
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ fi
- fi
-
- fi
-
-
-- if test $kde_have_crypt = yes; then
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_CRYPT 1
--_ACEOF
-+if test "$kde_python_link_found" = no; then
-
-- fi
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-
- echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-- if test "${kde_cv_socklen_t+set}" = set; then
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
++ { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_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
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- kde_cv_socklen_t=no
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include <sys/types.h>
-- #include <sys/socket.h>
-+#include <Python.h>
-
- int
- main ()
- {
-
-- socklen_t len;
-- getpeername(0,0,&len);
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
++ 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'
+@@ -22990,23 +24872,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -39466,128 +25958,76 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
--
-- kde_cv_socklen_t=yes
-- kde_cv_socklen_t_equiv=socklen_t
--
-+ kde_cv_try_link_python_pthread_and_dl=yes
- else
+@@ -23018,7 +24913,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread_and_dl=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23029,17 +24926,17 @@
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
fi
- echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-echo "${ECHO_T}$kde_cv_socklen_t" >&6
-- if test $kde_cv_socklen_t = no; then
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+ if test $kde_cv_socklen_t = no; then
- echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
-- if test "${kde_cv_socklen_t_equiv+set}" = set; then
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
++ { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t_equiv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_socklen_t_equiv=int
+ kde_cv_socklen_t_equiv=int
- 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
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- for t in int size_t unsigned long "unsigned long"; do
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include <sys/types.h>
-- #include <sys/socket.h>
-+#include <Python.h>
-
- int
- main ()
- {
-
-- $t len;
-- getpeername(0,0,&len);
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
++ 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'
+@@ -23068,23 +24965,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -39595,1510 +26035,1144 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
--
-- kde_cv_socklen_t_equiv="$t"
-- break
--
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
+@@ -23096,7 +25006,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread_and_panel_curses=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ ac_ext=c
+@@ -23108,8 +25020,8 @@
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
fi
- echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
-- fi
-+fi
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+ fi
--cat >>confdefs.h <<_ACEOF
--#define kde_socklen_t $kde_cv_socklen_t_equiv
--_ACEOF
+ cat >>confdefs.h <<_ACEOF
+@@ -23122,8 +25034,8 @@
+ _ACEOF
--cat >>confdefs.h <<_ACEOF
--#define ksize_t $kde_cv_socklen_t_equiv
--_ACEOF
-+if test "$kde_python_link_found" = no; then
-
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-
- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
--if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldnet $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23138,17 +45999,14 @@
+@@ -23136,39 +25048,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char dnet_ntoa ();
-+#include <Python.h>
-+
+ char dnet_ntoa ();
int
main ()
{
-dnet_ntoa ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return dnet_ntoa ();
;
return 0;
}
-@@ -23174,56 +46032,99 @@
+ _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
-- ac_cv_lib_dnet_dnet_ntoa=yes
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
+@@ -23177,21 +25102,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
--if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
-- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
--if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+fi
-+
-+
-+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+#MIN_CONFIG(3.3)
-+
-+# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h
-+
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-+
-+
-+
-+
-+
-+for ac_header in unistd.h sys/param.h floatingpoint.h paths.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldnet_stub $LIBS"
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -23204,39 +25130,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--
+
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char dnet_ntoa ();
--int
--main ()
--{
+ char dnet_ntoa ();
+ int
+ main ()
+ {
-dnet_ntoa ();
-- ;
-- return 0;
--}
-+$ac_includes_default
-+#include <$ac_header>
++return dnet_ntoa ();
+ ;
+ return 0;
+ }
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
-@@ -23236,89 +46137,144 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lib_dnet_stub_dnet_ntoa=yes
-+ ac_header_compiler=yes
- else
+@@ -23245,21 +25184,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
--if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+ac_header_compiler=no
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-+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
-- fi
+ fi
- echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
--if test "${ac_cv_func_inet_ntoa+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define inet_ntoa to an innocuous variant, in case <limits.h> declares inet_ntoa.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define inet_ntoa innocuous_inet_ntoa
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char inet_ntoa (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+#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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23286,52 +25226,59 @@
--#undef inet_ntoa
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
+ #undef inet_ntoa
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char inet_ntoa ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
--choke me
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
-#else
-char (*f) () = inet_ntoa;
-#endif
-#ifdef __cplusplus
-}
--#endif
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-+if test "${ac_cv_c_bigendian+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/param.h>
+ #endif
int
main ()
{
-return f != inet_ntoa;
-+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+ bogus endian macros
-+#endif
-+
++return inet_ntoa ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
-@@ -23331,58 +46287,36 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_func_inet_ntoa=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
+@@ -23340,17 +25287,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_cv_func_inet_ntoa=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
++ ac_cv_func_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
--
-- if test $ac_cv_func_inet_ntoa = no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+
+ if test $ac_cv_func_inet_ntoa = no; then
- echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
--if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
++ { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23363,39 +25311,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/param.h>
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char inet_ntoa ();
+ char inet_ntoa ();
int
main ()
{
-inet_ntoa ();
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+
++return inet_ntoa ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
-@@ -23395,89 +46329,51 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lib_nsl_inet_ntoa=yes
-+ ac_cv_c_bigendian=yes
- else
+@@ -23404,21 +25365,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_inet_ntoa=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
--if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-+ac_cv_c_bigendian=no
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
--
-- fi
+
+ fi
- echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
--if test "${ac_cv_func_connect+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+# It does not; compile a test program.
-+if test "$cross_compiling" = yes; then
-+ # try to guess the endianness by grepping values into an object file
-+ ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define connect innocuous_connect
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef connect
--
+@@ -23445,52 +25407,59 @@
+
+ #undef connect
+
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char connect ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char connect ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_connect) || defined (__stub___connect)
--choke me
++#if defined __stub_connect || defined __stub___connect
+ choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
--#endif
--
-+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ #endif
+
int
main ()
{
-return f != connect;
-+ _ascii (); _ebcdic ();
++return connect ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
-@@ -23490,595 +46386,483 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_func_connect=yes
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-+ ac_cv_c_bigendian=yes
-+fi
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
-+fi
- else
+@@ -23499,17 +25468,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
++ ac_cv_func_connect=no
fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
--
-- if test $ac_cv_func_connect = no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_connect+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -23522,39 +25492,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--
+
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char connect ();
+ char connect ();
int
main ()
{
-connect ();
-- ;
-- return 0;
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long l;
-+ char c[sizeof (long)];
-+ } u;
-+ u.l = 1;
-+ exit (u.c[sizeof (long) - 1] == 1);
++return connect ();
+ ;
+ return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
-+rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ 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=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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
-+ (eval $ac_link) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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_lib_socket_connect=yes
-+ ac_cv_c_bigendian=no
- else
-- echo "$as_me: failed program was:" >&5
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
+@@ -23563,22 +25546,23 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
-+( exit $ac_status )
-+ac_cv_c_bigendian=yes
++ ac_cv_lib_socket_connect=no
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
--if test $ac_cv_lib_socket_connect = yes; then
-- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+case $ac_cv_c_bigendian in
-+ yes)
-- fi
-+cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+ ;;
-+ no)
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+echo "$as_me: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+esac
+ fi
- echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
--if test "${ac_cv_func_remove+set}" = set; then
-+
-+echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
-+echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
-+if test "${ac_cv_maxpathlen+set}" = set; then
++ { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+@@ -23605,52 +25589,59 @@
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/param.h>
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
- #endif
+ #undef remove
--#undef remove
-+KDE_HELLO MAXPATHLEN
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char remove ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char remove ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_remove) || defined (__stub___remove)
--choke me
++#if defined __stub_remove || defined __stub___remove
+ choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
--#endif
-+EOF
+ #endif
--int
--main ()
--{
+ int
+ main ()
+ {
-return f != remove;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return remove ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_func_remove=yes
-+ (exit $ac_status); } && test -s conftest.out; then
-+ ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_maxpathlen=1024
-+fi
-+
-+rm conftest.*
-+
+ (exit $ac_status); }; }; then
+@@ -23659,17 +25650,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
++ ac_cv_func_remove=no
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
+
-+echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
-+echo "${ECHO_T}$ac_cv_maxpathlen" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define KDEMAXPATHLEN $ac_cv_maxpathlen
-+_ACEOF
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for Qt docs" >&5
-+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
-+kde_qtdir=
-+if test "${with_qt_dir+set}" = set; then
-+ kde_qtdir="$with_qt_dir"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-- if test $ac_cv_func_remove = no; then
+ if test $ac_cv_func_remove = no; then
- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+
-+QTDOCDIR=NO
-+for i in $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ;
-+do
-+ for j in qsql.html;
-+ do
-+ echo "configure: 46537: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ QTDOCDIR=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-+echo "${ECHO_T}$QTDOCDIR" >&6
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for dot" >&5
-+echo $ECHO_N "checking for dot... $ECHO_C" >&6
-+ if test -n "$DOT"; then
-+ kde_cv_path="$DOT";
-+ else
-+ kde_cache=`echo dot | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+@@ -23682,39 +25674,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char remove ();
--int
--main ()
--{
+ char remove ();
+ int
+ main ()
+ {
-remove ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return remove ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_posix_remove=yes
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs=" $dirs"
-+ else dirs="$dirs "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/dot"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/dot 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/dot"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/dot"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DOT=$kde_cv_path
-+
-+ fi
-+
-+if test -n "$DOT"; then
-+ KDE_HAVE_DOT="YES"
-+else
-+ KDE_HAVE_DOT="NO"
-+fi
-+
-+
-+ echo "$as_me:$LINENO: checking for doxygen" >&5
-+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
-+ if test -n "$DOXYGEN"; then
-+ kde_cv_path="$DOXYGEN";
-+ else
-+ kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23723,14 +25728,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
--if test $ac_cv_lib_posix_remove = yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs=" $dirs"
-+ else dirs="$dirs "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/doxygen"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/doxygen 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/doxygen"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/doxygen"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
+@@ -23738,8 +25744,8 @@
fi
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
--if test "${ac_cv_func_shmat+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. */
--/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shmat innocuous_shmat
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23766,52 +25772,59 @@
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ DOXYGEN=$kde_cv_path
+ #undef shmat
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+ fi
-
--#undef shmat
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char shmat ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char shmat ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_shmat) || defined (__stub___shmat)
--choke me
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
--#endif
+ #endif
--int
--main ()
--{
+ int
+ main ()
+ {
-return f != shmat;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return shmat ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func_shmat=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+DOXYGEN_PROJECT_NAME="The KOffice API Reference"
-+DOXYGEN_PROJECT_NUMBER="Version $VERSION"
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23820,18 +25833,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
++ ac_cv_func_shmat=no
+ fi
+
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+ KDE_HAS_DOXYGEN=yes
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
--if test $ac_cv_func_shmat = yes; then
-- :
--else
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+ :
+ else
- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
--if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+
-+
-+
-+
-+
-+# Check for ImageMagick...
-+
-+have_imagemagick=no
-+
-+ echo "$as_me:$LINENO: checking for Magick-config" >&5
-+echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6
-+ if test -n "$MAGICK_CONFIG"; then
-+ kde_cv_path="$MAGICK_CONFIG";
-+ else
-+ kde_cache=`echo Magick-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lipc $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+@@ -23844,39 +25858,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char shmat ();
--int
--main ()
--{
+ char shmat ();
+ int
+ main ()
+ {
-shmat ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return shmat ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_ipc_shmat=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/Magick-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/Magick-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/Magick-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/Magick-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23885,14 +25912,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
--if test $ac_cv_lib_ipc_shmat = yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
--fi
-
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-
-
-- # more headers that need to be explicitly included on darwin
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-+ fi
-
--for ac_header in sys/types.h stdint.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -23906,18 +25934,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
-- # Is the header compilable?
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&5
-+echo "$as_me: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MAGICK_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$MAGICK_CONFIG"; then
-+ vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5005002
-+ then
-+ if test "$vers" -ge 6000003
-+ then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK6 1
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
--rm -f conftest.$ac_objext
+@@ -23928,23 +25957,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -23953,15 +25995,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+ fi
-+ if test "$vers" -ge 6001000
-+ then
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK61 1
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
-+
-+ fi
-+ LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
-+ LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`"
-+ LIBMAGICK_RPATH=
-+ for args in $LIBMAGICK_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MAGICK 1
+@@ -23970,8 +26013,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+
-+ have_imagemagick=yes
- else
-- ac_cpp_err=
-+ { echo "$as_me:$LINENO: WARNING: You need at least ImageMagick 5.5.2" >&5
-+echo "$as_me: WARNING: You need at least ImageMagick 5.5.2" >&2;}
- fi
--else
-- ac_cpp_err=yes
- fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&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
+@@ -23995,9 +26043,10 @@
-- ac_header_preproc=no
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBMAGICK_RPATH=
+ ac_header_preproc=no
fi
--rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24021,25 +26070,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -41107,218 +27181,154 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+
-+
-+if test "$have_imagemagick" = "yes" -a HAVE_MAGICK61; then
-+ include_imagemagick_filter_TRUE=
-+ include_imagemagick_filter_FALSE='#'
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ include_imagemagick_filter_TRUE='#'
-+ include_imagemagick_filter_FALSE=
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-
--fi
-+# End of ImageMagick check
-
--done
-+##########################################################################
-+# This last check is copied from kdenonbeta/gsf/configure.in.in
-+##########################################################################
-+# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+# also defines GSTUFF_PKG_ERRORS on error
-+# Note: This is specially tweaked for karbon's fontconfig check. Please fix
-+# it before using it for other tests :-)
-
-
-- # sys/bitypes.h is needed for uint32_t and friends on Tru64
-+# --- Check for KDE 3.2 or 3.3 ---
-+
-+echo "$as_me:$LINENO: checking for KDE version" >&5
-+echo $ECHO_N "checking for KDE version... $ECHO_C" >&6
-+
-+
-+
-+ 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'
-+
-+
-+kdeversion_save_CXXFLAGS="$CXXFLAGS"
-+kdeversion_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CXXFLAGS="$CXXFLAGS $all_includes"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
-+#error KDE 3.2
-+#endif
-
--for ac_header in sys/bitypes.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24057,18 +26100,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
-- # Is the header compilable?
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
+@@ -24079,23 +26123,36 @@
+ #include <$ac_header>
+ _ACEOF
rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -24089,7 +46873,7 @@
+-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'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
-@@ -24101,204 +46885,104 @@
+ 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_header_compiler=yes
-+ need_kde32_compat="no"
-+
- else
+@@ -24104,15 +26161,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-+need_kde32_compat="yes"
++ ac_header_compiler=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
-+
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
-+#error KDE 3.3
-+#endif
-+
+ /* confdefs.h. */
_ACEOF
+@@ -24121,8 +26179,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
-+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); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
-+ (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_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
-+ need_kde33_compat="no"
+@@ -24146,9 +26209,10 @@
+
+ ac_header_preproc=no
+ fi
+
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24172,25 +26236,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -41327,71 +27337,71 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+need_kde33_compat="yes"
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24204,8 +26262,8 @@
--done
--
--
-- # darwin requires a poll emulation library
+
+ # darwin requires a poll emulation library
- echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
--if test "${ac_cv_lib_poll_poll+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpoll $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24218,39 +26276,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
-+#error KDE 3.4
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char poll ();
--int
--main ()
--{
+ char poll ();
+ int
+ main ()
+ {
-poll ();
-- ;
-- return 0;
--}
-+
++return poll ();
+ ;
+ return 0;
+ }
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
@@ -41399,210 +27409,176 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lib_poll_poll=yes
-+ need_kde34_compat="no"
-+
- else
+@@ -24259,14 +26330,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_poll_poll=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_poll_poll=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
--if test $ac_cv_lib_poll_poll = yes; then
-- LIB_POLL="-lpoll"
-+need_kde34_compat="yes"
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+ LIB_POLL="-lpoll"
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-+cat >conftest.$ac_ext <<_ACEOF
-
-- # for some image handling on Mac OS X
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
-+#error KDE 3.5.x (x < 2)
-+#endif
-
--for ac_header in Carbon/Carbon.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -24277,18 +26349,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
-- # Is the header compilable?
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
+@@ -24299,23 +26372,36 @@
+ #include <$ac_header>
+ _ACEOF
rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -24309,7 +46993,7 @@
+-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'
-+ { 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
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
-@@ -24321,335 +47005,242 @@
+ 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_header_compiler=yes
-+ need_kde351_compat="no"
-+
- else
+@@ -24324,15 +26410,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-+need_kde351_compat="yes"
++ ac_header_compiler=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+CXXFLAGS="$kdeversion_save_CXXFLAGS"
-+LIBS="$kdeversion_safe_LIBS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24341,8 +26428,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
-+
-+if test "$need_kde32_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
-+echo "${ECHO_T}KDE 3.2.x" >&6
- else
-- ac_cpp_err=yes
-+ if test "$need_kde33_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
-+echo "${ECHO_T}KDE 3.3.x" >&6
-+ else
-+ if test "$need_kde34_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
-+echo "${ECHO_T}KDE 3.4.x" >&6
-+ else
-+ if test "$need_kde351_compat" = "yes"; then
-+ echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
-+echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6
-+ else
-+ echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
-+echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6
-+ fi
-+ fi
-+ fi
++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
+@@ -24366,9 +26458,10 @@
+
+ ac_header_preproc=no
fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
+
-+
-+
-+if test "$need_kde32_compat" = "yes"; then
-+ need_kde32_compatibility_TRUE=
-+ need_kde32_compatibility_FALSE='#'
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ need_kde32_compatibility_TRUE='#'
-+ need_kde32_compatibility_FALSE=
-+fi
-
-- ac_header_preproc=no
-+
-+
-+if test "$need_kde33_compat" = "yes"; then
-+ need_kde33_compatibility_TRUE=
-+ need_kde33_compatibility_FALSE='#'
-+else
-+ need_kde33_compatibility_TRUE='#'
-+ need_kde33_compatibility_FALSE=
- fi
--rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24392,25 +26485,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -41611,258 +27587,150 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+if test "$need_kde34_compat" = "yes"; then
-+ need_kde34_compatibility_TRUE=
-+ need_kde34_compatibility_FALSE='#'
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ need_kde34_compatibility_TRUE='#'
-+ need_kde34_compatibility_FALSE=
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
-+
-+
-+if test "$need_kde351_compat" = "yes"; then
-+ need_kde351_compatibility_TRUE=
-+ need_kde351_compatibility_FALSE='#'
-+else
-+ need_kde351_compatibility_TRUE='#'
-+ need_kde351_compatibility_FALSE=
fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24425,17 +26512,17 @@
-+
-+# Keep the old KDE 3.1 test, as long as it is still used
-+
-+
-+if test "supported" = "no"; then
-+ need_kde31_compatibility_TRUE=
-+ need_kde31_compatibility_FALSE='#'
-+else
-+ need_kde31_compatibility_TRUE='#'
-+ need_kde31_compatibility_FALSE=
- fi
-
--done
-
-+# --- End KDE 3.2 check ---
-
-- # CoreAudio framework
-- if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ # CoreAudio framework
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
- echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
--if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-+# --- OpenEXR check ---
-+
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
--else
-- # Is the header compilable?
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <CoreAudio/CoreAudio.h>
--_ACEOF
--rm -f conftest.$ac_objext
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24446,23 +26533,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24471,15 +26571,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
++ ac_header_compiler=no
+ fi
+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
- 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
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <CoreAudio/CoreAudio.h>
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
-+echo "$as_me: WARNING: Could not find pkg-config" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+echo "$as_me:$LINENO: checking for OpenEXR" >&5
-+echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`"
-+ OPENEXR_RPATH=
-+ for args in $OPENEXR_LIBS; do
-+ case $args in
-+ -L*)
-+ OPENEXR_RPATH="$OPENEXR_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"`
-+ OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_OPENEXR 1
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
+@@ -24488,8 +26589,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-+
- fi
--else
-- ac_cpp_err=yes
- fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&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
+@@ -24513,9 +26619,10 @@
-- ac_header_preproc=no
-+if test ! "$USE_RPATH" = "yes"; then
-+ OPENEXR_RPATH=
+ ac_header_preproc=no
fi
--rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24539,25 +26646,18 @@
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -41871,756 +27739,687 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
--if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -n "$OPENEXR_LIBS"
-+then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
--fi
+ ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
--
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+
fi
--if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24574,8 +26674,8 @@
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_COREAUDIO 1
--_ACEOF
--
-- FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
--fi
-
-
-
-
- echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
-- kde_libs_safe="$LIBS"
-- LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+if test -n "$OPENEXR_LIBS"; then
-+ have_openexr_TRUE=
-+ have_openexr_FALSE='#'
-+else
-+ have_openexr_TRUE='#'
-+ have_openexr_FALSE=
-+fi
-
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
-
--int
--main ()
--{
-+# --- End of OpenEXR check ---
-
-- res_init();
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+ kde_libs_safe="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24601,30 +26701,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+DO_NOT_COMPILE="$DO_NOT_COMPILE example"
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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"
+ LIBRESOLV="-lresolv"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+# Check if the tiff lib is available
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_RES_INIT 1
--_ACEOF
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24635,25 +26748,25 @@
+ 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
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- LIBS=$kde_libs_safe
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_libs_safe
-+echo "$as_me:$LINENO: checking for libtiff tiff" >&5
-+echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6
-echo "$as_me:$LINENO: checking for res_init" >&5
-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
--if test "${kde_cv_func_res_init+set}" = set; then
-+if test "${kde_cv_libtiff_tiff+set}" = set; then
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24664,12 +47255,15 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
--save_CXXFLAGS="$CXXFLAGS"
--kde_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
+-
+- 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'
+@@ -24665,9 +26778,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lm"
- fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
+-fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24677,26 +47271,19 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--
-+#include<tiffio.h>
-
- int
- main ()
- {
--
--res_init()
--
-+return (TIFFOpen( "", "r") == 0);
- ;
- return 0;
+@@ -24693,23 +26803,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -24709,22 +47296,28 @@
+ 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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- kde_cv_func_res_init=yes
-+
-+ kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
-+
- else
+@@ -24718,8 +26841,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_res_init=no
-+
-+ kde_cv_libtiff_tiff=no
-+
++ kde_cv_func_res_init=no
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--CXXFLAGS="$save_CXXFLAGS"
--LIBS="$kde_safe_LIBS"
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -24735,29 +47328,17 @@
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -24733,11 +26857,11 @@
fi
-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-echo "${ECHO_T}$kde_cv_func_res_init" >&6
-+if test "$kde_cv_libtiff_tiff" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBTIFF=""
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
--if test "${kde_cv_proto_res_init+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
-+echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6
-
--if test "x$kde_cv_func_res_init" = xyes; then
-- kde_cv_proto_res_init=no
-+if test "${kde_cv_libtiff_tiff34+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- case "res_init" in
-- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-- kde_cv_proto_res_init="yes - in libkdefakes"
-- ;;
-- *)
-- kde_cv_proto_res_init=unknown
-- ;;
-- esac
--fi
--
--if test "x$kde_cv_proto_res_init" = xunknown; then
+@@ -24758,8 +26882,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
-
-@@ -24770,30 +47351,28 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-- kde_safe_libs=$LIBS
-- LIBS="$LIBS $X_EXTRA_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lm"
-+fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--
--
--extern "C" int res_init(void);
-+#include<tiffio.h>
-
- int
- main ()
- {
--
--res_init()
--
-+return (TIFFOpen( "", "r") == 0);
- ;
- return 0;
+- 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'
+@@ -24797,23 +26920,36 @@
}
-@@ -24819,287 +47398,119 @@
+ _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
-- kde_cv_func_res_init=yes
-- kde_cv_proto_res_init=yes
-+
-+ kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
-+
- else
+@@ -24823,9 +26959,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_proto_res_init="res_init unavailable"
-+
-+ kde_cv_libtiff_tiff34=no
++ kde_cv_proto_res_init="res_init unavailable"
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$kde_safe_libs
-+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ LIBS=$kde_safe_libs
+@@ -24839,8 +26976,8 @@
--fi
-
fi
-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
--if test "x$kde_cv_func_res_init" = xyes; then
-+if test "$kde_cv_libtiff_tiff34" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBTIFF=""
+ if test "x$kde_cv_func_res_init" = xyes; then
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_RES_INIT 1
-+else
-+ LIBTIFF="$kde_cv_libtiff_tiff34"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTIFF 1
- _ACEOF
+@@ -24867,8 +27004,8 @@
+ LIBSOCKET="$X_EXTRA_LIBS"
- fi
--if test "x$kde_cv_proto_res_init" = xno; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_RES_INIT_PROTO 1
--_ACEOF
-
--fi
-+else
-+ LIBTIFF="$kde_cv_libtiff_tiff"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTIFF 1
-+_ACEOF
-
-
-+fi
-
-
-
-
-- LIBSOCKET="$X_EXTRA_LIBS"
-
-
- echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
--if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lucb $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24881,39 +27018,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char killpg ();
--int
--main ()
--{
+ char killpg ();
+ int
+ main ()
+ {
-killpg ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return killpg ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_ucb_killpg=yes
-+if test -n "$LIBTIFF"; then
-+ have_tiff_TRUE=
-+ have_tiff_FALSE='#'
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24922,27 +27072,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_cv_lib_ucb_killpg=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_ucb_killpg=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
--if test $ac_cv_lib_ucb_killpg = yes; then
-- LIBUCB="-lucb"
-+ have_tiff_TRUE='#'
-+ have_tiff_FALSE=
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+ LIBUCB="-lucb"
fi
-- case $host in *-*-lynxos* )
+ case $host in *-*-lynxos* )
- echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
-- CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
++ { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+ CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
- echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6
- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
--if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbsd $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24955,39 +27106,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char gethostbyname ();
--int
--main ()
--{
+ char gethostbyname ();
+ int
+ main ()
+ {
-gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return gethostbyname ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_bsd_gethostbyname=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -24996,22 +27160,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
--if test $ac_cv_lib_bsd_gethostbyname = yes; then
-- LIBSOCKET="-lbsd"
--fi
-- ;;
-- esac
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ LIBSOCKET="-lbsd"
+ fi
+ ;;
+ esac
- echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
--if test "${ac_cv_type_int+set}" = set; then
-+echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png+set}" = set; then
++ { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+@@ -25022,35 +27187,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
-if ((int *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (int))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_type_int=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25059,20 +27238,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
++ ac_cv_type_int=no
fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
--if test "${ac_cv_sizeof_int+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_int" = yes; then
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_int" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25085,10 +27265,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+ #include<png.h>
-+
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
--test_array [0] = 0
-+
-+ png_structp png_ptr = png_create_read_struct( /* image ptr */
-+ PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+ return( png_ptr != 0 );
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
;
- return 0;
+@@ -25096,23 +27277,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25112,34 +47523,92 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
-+ eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "ac_cv_lib_png=no"
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+
-+fi
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPNG 1
-+_ACEOF
-+
-+ LIBPNG="$ac_cv_lib_png"
-+
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ LIBPNG=""
-+
-+fi
-+
-+
-+
-+if test -n "$LIBPNG"; then
-+ have_png_TRUE=
-+ have_png_FALSE='#'
-+else
-+ have_png_TRUE='#'
-+ have_png_FALSE=
-+fi
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -25125,10 +27319,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
--test_array [0] = 0
--
-+jpeg_CreateDecompress();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25136,23 +27331,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25152,90 +47621,71 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_hi=$ac_mid; break
-+ eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
- else
+@@ -25161,30 +27369,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42630,126 +28429,139 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+eval "ac_cv_lib_jpeg_6b=no"
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_6b"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
-- ;
-- return 0;
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
+ ;
+@@ -25192,23 +27402,36 @@
}
--_ACEOF
--rm -f conftest.$ac_objext
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
-+#endif
-+
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25221,10 +27444,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
--test_array [0] = 0
--
-+jpeg_CreateDecompress();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25232,23 +27456,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25248,178 +47698,557 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lo=$ac_mid; break
-+ eval "ac_cv_lib_jpeg_normal=-ljpeg"
- else
+@@ -25257,23 +27494,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42759,836 +28571,426 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+eval "ac_cv_lib_jpeg_normal=no"
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
+
-+fi
-+
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-+ LIBJPEG="$ac_cv_lib_jpeg_normal"
-+ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+ LIBJPEG=
-+
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo= ac_hi=
++ ac_lo= ac_hi=
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25285,10 +27525,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
-+
-+
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+
-+jpeg_incdir=NO
-+for i in $jpeg_incdirs;
-+do
-+ for j in jpeglib.h;
-+ do
-+ echo "configure: 47748: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ jpeg_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBJPEG 1
+ ;
+@@ -25296,23 +27537,36 @@
+ }
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=$ac_mid
-+
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+ { echo "$as_me:$LINENO: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&5
-+echo "$as_me: WARNING:
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+" >&2;}
-+ else
-+ { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-+echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-+ fi
-+ jpeg_incdir=
-+ LIBJPEG=
-+fi
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -25321,24 +27575,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBJPEG"; then
-+ have_jpeg_TRUE=
-+ have_jpeg_FALSE='#'
-+else
-+ have_jpeg_TRUE='#'
-+ have_jpeg_FALSE=
++ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+
-+#---------------------------------------------------------
-+# libexif detection
-+# taken from libkexif's configure.in.in
-+#---------------------------------------------------------
-+
-+LIBEXIF=no
-+
-+#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, ,
-+# [ AC_MSG_WARN([libexif >= 0.5.7 not found.])
-+# LIBEXIF=yes ])
-+
-+
-+#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9,
-+# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]),
-+# AC_MSG_WARN([Using old version of libexif.]))
-+
-+
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
--case $ac_lo in
--?*) ac_cv_sizeof_int=$ac_lo;;
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+done
-+
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
++ { (exit 77); exit 77; }; } ;;
esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
-+echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6
-+
-+ if $PKG_CONFIG --exists "libexif >= 0.6.12 " ; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ succeeded=yes
-+
-+ echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
-+echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6
-+ LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12 "`
-+ echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
-+echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6
-+
-+ echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
-+echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6
-+ LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12 "`
-+ echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
-+echo "${ECHO_T}$LIBEXIF_LIBS" >&6
-+ else
-+ LIBEXIF_CFLAGS=""
-+ LIBEXIF_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif >= 0.6.12 "`
-+
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ :
-+ else
-+ { echo "$as_me:$LINENO: WARNING: libexif >= 0.6.12 not found." >&5
-+echo "$as_me: WARNING: libexif >= 0.6.12 not found." >&2;}
-+ LIBEXIF=yes
-+ fi
-+
-+
-+
-+
-+
-+#---------------------------------------------------------
-+# libexif detection
-+#---------------------------------------------------------
-+echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
-+echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6
-+
-+
-+ 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'
-+
-+
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
-+if test "${exif_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+ cat >conftest.$ac_ext <<_ACEOF
+-else
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -25346,8 +27596,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
+ $ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
++ typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25356,35 +27607,44 @@
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (int))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (int))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
-- else
-- {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (int))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
-+ extern "C" {
-+#include <libexif/exif-loader.h>
-+#include <libexif/exif-utils.h>
-+}
-+
-+int
-+main ()
-+{
-+
-+ ExifLoader *l = exif_loader_new ();
-+ exif_loader_write_file (l,"kikoo");
-+ return 0;
++ return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
--rm -f conftest$ac_exeext
+ rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 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'
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
-- ac_cv_sizeof_int=`cat conftest.val`
-+ exif_build=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
+@@ -25395,28 +27655,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
--( exit $ac_status )
+ ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+exif_build=no
- fi
+-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
++ { (exit 77); exit 77; }; }
fi
-+
-+echo "$as_me:$LINENO: result: $exif_build" >&5
-+echo "${ECHO_T}$exif_build" >&6
-+if test "$exif_build" = "no"; then
-+ LIBEXIF=""
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
--rm -f conftest.val
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+if test -n "$LIBEXIF"; then
-+ have_exif_TRUE=
-+ have_exif_FALSE='#'
+ rm -f conftest.val
else
-- ac_cv_sizeof_int=0
-+ have_exif_TRUE='#'
-+ have_exif_FALSE=
+ ac_cv_sizeof_int=0
fi
-+
-+
-+
-+if test -n "$LIBJPEG" -a -n "$LIBEXIF"; then
-+ include_jpeg_filter_TRUE=
-+ include_jpeg_filter_FALSE='#'
-+else
-+ include_jpeg_filter_TRUE='#'
-+ include_jpeg_filter_FALSE=
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+
-+
-+
-+if test -n "$LIBTIFF" -a -n "$LIBEXIF"; then
-+ include_tiff_filter_TRUE=
-+ include_tiff_filter_FALSE='#'
-+else
-+ include_tiff_filter_TRUE='#'
-+ include_tiff_filter_FALSE=
-+fi
-+
-+
-+
-+# Check whether --with-libwv2 or --without-libwv2 was given.
-+if test "${with_libwv2+set}" = set; then
-+ withval="$with_libwv2"
-+
-+ if test "x$withval" != "xno" ; then
-+ if test "x$withval" != "xyes" ; then
-+ WV2_DIR=$withval
-+ fi
-+ search_for_wv2=yes
-+ else
-+ search_for_wv2=no
-+ fi
-+
-+else
-+ search_for_wv2=yes
-+
-+fi;
-+
-+if test $search_for_wv2 != no ; then
-+ if test -n "$WV2_DIR" ; then
-+
-+ echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+ if test -n "$WV2_CONFIG"; then
-+ kde_cv_path="$WV2_CONFIG";
-+ else
-+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="$WV2_DIR/bin $dirs"
-+ else dirs="$dirs $WV2_DIR/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/wv2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/wv2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&5
-+echo "$as_me: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ WV2_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+ else
-+
-+ echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+ if test -n "$WV2_CONFIG"; then
-+ kde_cv_path="$WV2_CONFIG";
-+ else
-+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/wv2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/wv2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/wv2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&5
-+echo "$as_me: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ WV2_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+ fi
-+fi
-+
-+if test -n "$WV2_CONFIG"; then
-+ vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1009
-+ then
-+ LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-+ LIBWV2_RPATH=
-+ for args in $LIBWV2_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWV2_RPATH="$LIBWV2_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`"
-+
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT $ac_cv_sizeof_int
-+#define HAVE_WV2 1
+ #define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
- echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6
--if test "${ac_cv_type_short+set}" = set; then
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least version 0.1.9 of libwv2" >&5
-+echo "$as_me: WARNING: You need at least version 0.1.9 of libwv2" >&2;}
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBWV2_LIBS"; then
-+ include_wv2_msword_filter_TRUE=
-+ include_wv2_msword_filter_FALSE='#'
-+else
-+ include_wv2_msword_filter_TRUE='#'
-+ include_wv2_msword_filter_FALSE=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+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`
-+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25428,14 +48257,14 @@
- cat confdefs.h >>conftest.$ac_ext
+@@ -25427,35 +27686,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <sys/types.h>
-+#include <$ac_hdr>
-+
+ $ac_includes_default
++typedef short ac__type_new_;
int
main ()
{
-if ((short *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (short))
-- return 0;
-+if ((DIR *) 0)
-+return 0;
++if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
-@@ -25461,50 +48290,60 @@
+ _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_type_short=yes
-+ eval "$as_ac_Header=yes"
- else
+@@ -25464,20 +27737,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
-+eval "$as_ac_Header=no"
++ ac_cv_type_short=no
fi
++
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
--if test "${ac_cv_sizeof_short+set}" = set; then
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test "$ac_cv_type_short" = yes; then
+ if test "$ac_cv_type_short" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25490,10 +27764,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+/* 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 ();
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
--test_array [0] = 0
--
-+opendir ();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25501,23 +27776,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25517,34 +48356,48 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lo=0 ac_mid=0
-- while :; do
-+ ac_cv_search_opendir="none required"
-+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
+@@ -25530,10 +27818,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+/* 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 ();
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
--test_array [0] = 0
--
-+opendir ();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25541,23 +27830,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25557,50 +48410,65 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_hi=$ac_mid; break
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
- else
+@@ -25566,30 +27868,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43598,141 +29000,139 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+
-+fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-+else
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+/* 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 ();
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
--test_array [0] = 0
--
-+opendir ();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25597,23 +27901,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25613,34 +48481,48 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_hi=-1 ac_mid=-1
-- while :; do
-+ ac_cv_search_opendir="none required"
-+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
+@@ -25626,10 +27943,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+
-+/* 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 ();
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
--test_array [0] = 0
--
-+opendir ();
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -25637,23 +27955,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25653,50 +48535,53 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lo=$ac_mid; break
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
- else
+@@ -25662,23 +27993,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43742,447 +29142,426 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo= ac_hi=
++ ac_lo= ac_hi=
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25690,10 +28024,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
;
- return 0;
-@@ -25723,28 +48608,61 @@
+@@ -25701,23 +28036,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
-- ac_hi=$ac_mid
-+ ac_cv_header_stdc=yes
- else
+@@ -25726,24 +28074,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_cv_header_stdc=no
++ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
++
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_short=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then
-+ :
++ { (exit 77); exit 77; }; } ;;
+ esac
else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-+ :
- else
+-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25752,36 +48670,28 @@
- cat confdefs.h >>conftest.$ac_ext
+ _ACEOF
+@@ -25751,8 +28095,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
+ $ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
--#include <stdio.h>
--#include <stdlib.h>
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++ typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
int
- main ()
- {
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
+@@ -25761,35 +28106,44 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (short))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (short))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
-- else
-- {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (short))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
--
-- ;
-- return 0;
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ exit(2);
-+ exit (0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -25795,36 +48705,38 @@
+-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
-- ac_cv_sizeof_short=`cat conftest.val`
-+ :
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+@@ -25800,28 +28154,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+ac_cv_header_stdc=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+ rm -f conftest.val
+ else
+ ac_cv_sizeof_short=0
fi
--rm -f conftest.val
--else
-- ac_cv_sizeof_short=0
--fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_SHORT $ac_cv_sizeof_short
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
- echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
--if test "${ac_cv_type_long+set}" = set; then
-+fi
-+
-+
-+
-+
-+for ac_func in rewinddir popen mkstemp
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25833,21 +48745,54 @@
- cat confdefs.h >>conftest.$ac_ext
+@@ -25832,35 +28185,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
+ $ac_includes_default
++typedef long ac__type_new_;
int
main ()
{
-if ((long *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (long))
-- return 0;
-+return f != $ac_func;
++if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -25860,54 +48805,75 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_type_long=yes
-+ eval "$as_ac_var=yes"
- else
+@@ -25869,20 +28236,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
-+eval "$as_ac_var=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_exeext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_long+set}" = set; then
-+fi
-+done
-+
-+
-+# Check whether --enable-largefile or --disable-largefile was given.
-+if test "${enable_largefile+set}" = set; then
-+ enableval="$enable_largefile"
-+
-+fi;
-+if test "$enable_largefile" != no; then
-+
-+ echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test "$ac_cv_type_long" = yes; then
+ if test "$ac_cv_type_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
-+ ac_cv_sys_largefile_CC=no
-+ if test "$GCC" != yes; then
-+ ac_save_CC=$CC
-+ while :; do
-+ # IRIX 6.2 and later do not support large files by default,
-+ # so use the C compiler's -n32 option if that helps.
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -25895,10 +28263,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
;
- return 0;
+@@ -25906,23 +28275,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
-+ rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ 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=$?
-@@ -25928,26 +48894,15 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (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_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+@@ -25935,10 +28317,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
--test_array [0] = 0
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
-+fi
-+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
+ ;
+@@ -25946,23 +28329,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=$?
-@@ -25968,36 +48923,50 @@
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (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_hi=$ac_mid; break
-+ ac_cv_sys_largefile_CC=' -n32'; break
- else
+@@ -25971,30 +28367,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44192,103 +29571,139 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f conftest.err conftest.$ac_objext
-+ break
-+ done
-+ CC=$ac_save_CC
-+ rm -f conftest.$ac_ext
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+ if test "$ac_cv_sys_largefile_CC" != no; then
-+ CC=$CC$ac_cv_sys_largefile_CC
-+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-+ echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ while :; do
-+ ac_cv_sys_file_offset_bits=no
-+ cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
;
- return 0;
-@@ -26024,20 +48993,32 @@
+@@ -26002,23 +28400,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
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
-+ 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_ext
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -26031,10 +28442,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
;
- return 0;
-@@ -26064,44 +49045,51 @@
+@@ -26042,23 +28454,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
-- ac_lo=$ac_mid; break
-+ ac_cv_sys_file_offset_bits=64; break
- else
+@@ -26067,23 +28492,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44298,306 +29713,426 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
fi
++
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_lo= ac_hi=
-+ break
-+done
++ ac_lo= ac_hi=
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+if test "$ac_cv_sys_file_offset_bits" != no; then
+
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+rm -f conftest*
-+ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_large_files+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ while :; do
-+ ac_cv_sys_large_files=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26095,10 +28523,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
;
- return 0;
-@@ -26128,124 +49116,33 @@
+@@ -26106,23 +28535,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
-- ac_hi=$ac_mid
-+ break
- else
+@@ -26131,24 +28573,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
++
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_long=$ac_lo;;
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; } ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26156,8 +28594,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
++ typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26166,35 +28605,44 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (long))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (long))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
-- else
-- {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (long))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./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>&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof_long=`cat conftest.val`
--else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26205,28 +28653,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
--fi
--fi
++ { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+ ac_cv_sizeof_long=0
+ fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_LONG $ac_cv_sizeof_long
--_ACEOF
--
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+
- echo "$as_me:$LINENO: checking for char *" >&5
-echo $ECHO_N "checking for char *... $ECHO_C" >&6
--if test "${ac_cv_type_char_p+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
++ { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26237,35 +28684,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+ since some C++ compilers masquerading as C compilers
-+ incorrectly reject 9223372036854775807. */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+ && LARGE_OFF_T % 2147483647 == 1)
-+ ? 1 : -1];
+ $ac_includes_default
++typedef char * ac__type_new_;
int
main ()
{
-if ((char * *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (char *))
-- return 0;
-+
++if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
-@@ -26271,43 +49168,46 @@
+ _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_type_char_p=yes
-+ ac_cv_sys_large_files=1; break
- else
+@@ -26274,20 +28735,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
-+ break
-+done
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+if test "$ac_cv_sys_large_files" != no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
--if test "${ac_cv_sizeof_char_p+set}" = set; then
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-+if test "${ac_cv_sys_largefile_source+set}" = set; then
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test "$ac_cv_type_char_p" = yes; then
+ if test "$ac_cv_type_char_p" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
-+ while :; do
-+ ac_cv_sys_largefile_source=no
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -26300,10 +28762,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <stdio.h>
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
--test_array [0] = 0
--
-+return !fseeko;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -26311,23 +28774,36 @@
}
-@@ -26333,21 +49233,25 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
-+ 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_ext
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -26340,10 +28816,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#define _LARGEFILE_SOURCE 1
-+#include <stdio.h>
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
--test_array [0] = 0
--
-+return !fseeko;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -26351,23 +28828,36 @@
}
-@@ -26373,44 +49277,53 @@
+ _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_hi=$ac_mid; break
-+ ac_cv_sys_largefile_source=1; break
- else
+@@ -26376,30 +28866,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44607,184 +30142,139 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
++
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ break
-+done
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-+if test "$ac_cv_sys_largefile_source" != no; then
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+# 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.
-+echo "$as_me:$LINENO: checking for fseeko" >&5
-+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-+if test "${ac_cv_func_fseeko+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+#include <stdio.h>
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
--test_array [0] = 0
--
-+return fseeko && fseeko (stdin, 0, 0);
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -26407,23 +28899,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -26423,34 +49336,95 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_cv_func_fseeko=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_fseeko=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
-+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-+if test $ac_cv_func_fseeko = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_FSEEKO 1
-+_ACEOF
-+
-+fi
-+
-+
-+for ac_func in fseek64
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -26436,10 +28941,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
--test_array [0] = 0
--
-+return f != $ac_func;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -26447,23 +28953,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -26463,58 +49437,95 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_lo=$ac_mid; break
-+ eval "$as_ac_var=yes"
- else
+@@ -26472,23 +28991,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44794,1157 +30284,618 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+eval "$as_ac_var=no"
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_lo= ac_hi=
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++ ac_lo= ac_hi=
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+done
+
-+
-+for ac_func in ftell64
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26500,10 +29022,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
--test_array [0] = 0
--
-+return f != $ac_func;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
;
- return 0;
+@@ -26511,23 +29034,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -26527,120 +49538,222 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_hi=$ac_mid
-+ eval "$as_ac_var=yes"
- else
+@@ -26536,24 +29072,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
--case $ac_lo in
--?*) ac_cv_sizeof_char_p=$ac_lo;;
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; } ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-+
-+
-+
-+
-+
-+
-+
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-+ 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'
-+
-+
-+
-+for ac_header in paper.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
+-else
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -26561,8 +29093,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (char *)); }
-unsigned long ulongval () { return (long) (sizeof (char *)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
++ typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26571,35 +29104,44 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (char *))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (char *))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
-- else
-- {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (char *))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
--
-- ;
-- return 0;
--}
-+#include <$ac_header>
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
_ACEOF
--rm -f conftest$ac_exeext
+ rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 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'
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
-- ac_cv_sizeof_char_p=`cat conftest.val`
-+ ac_header_compiler=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
+@@ -26610,30 +29152,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
--( exit $ac_status )
+ ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+ac_header_compiler=no
- fi
+-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext 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
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
++ { (exit 77); exit 77; }; }
fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
--rm -f conftest.val
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ rm -f conftest.val
else
-- ac_cv_sizeof_char_p=0
-+ eval "$as_ac_Header=\$ac_header_preproc"
+ ac_cv_sizeof_char_p=0
fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
_ACEOF
-+fi
-+done
-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ CPPFLAGS=$kde_safe_cppflags
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ kde_save_LDFLAGS="$LDFLAGS"
-+ kde_save_LIBS="$LIBS"
-+ LDFLAGS="$LDFLAGS $all_libraries"
-+ case $host_os in
-+ aix*) LDFLAGS="-brtl $LDFLAGS"
-+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+ ;;
-+ esac
-+ echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
-+echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6
-+if test "${ac_cv_lib_paper_paperinit+set}" = set; then
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
-+LIBS="-lpaper $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -26654,11 +49767,11 @@
+@@ -26646,39 +29187,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
#endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char dlopen ();
-+char paperinit ();
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char dlopen ();
int
main ()
{
-dlopen ();
-+paperinit ();
++return dlopen ();
;
return 0;
}
-@@ -26684,837 +49797,800 @@
+ _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
-- ac_cv_lib_dl_dlopen=yes
-+ ac_cv_lib_paper_paperinit=yes
- else
+@@ -26687,14 +29241,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
-+ac_cv_lib_paper_paperinit=no
++ ac_cv_lib_dl_dlopen=no
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
-+echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6
-+if test $ac_cv_lib_paper_paperinit = yes; then
-+ LIBPAPER="-lpaper"
-+fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
--LIBDL="-ldl"
--ac_cv_have_dlfcn=yes
-+ LDFLAGS="$kde_save_LDFLAGS"
-+ LIBS="$kde_save_LIBS"
+ LIBDL="-ldl"
+@@ -26703,8 +29258,8 @@
+ fi
--fi
-
-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
-+echo "$as_me: WARNING: Could not find pkg-config" >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
-+ LIBWPD_RPATH=
-+ for args in $LIBWPD_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWPD_RPATH="$LIBWPD_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_WPD 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+@@ -26717,39 +29272,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char shl_unload ();
--int
--main ()
--{
+ char shl_unload ();
+ int
+ main ()
+ {
-shl_unload ();
-- ;
-- return 0;
--}
-+ fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBWPD_LIBS"; then
-+ include_wpd_filter_TRUE=
-+ include_wpd_filter_FALSE='#'
-+else
-+ include_wpd_filter_TRUE='#'
-+ include_wpd_filter_FALSE=
-+fi
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for xml2-config" >&5
-+echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
-+ if test -n "$XML_CONFIG"; then
-+ kde_cv_path="$XML_CONFIG";
-+ else
-+ kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xml2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xml2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xml2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xml2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+ HELP_SUBDIR=
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XML_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$XML_CONFIG"; then
-+ vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2004008
-+ then
-+ LIBXML_LIBS="`$XML_CONFIG --libs`"
-+ LIBXML_RPATH=
-+ for args in $LIBXML_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXML_RPATH="$LIBXML_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+
-+
-+ echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+ if test -n "$XMLLINT"; then
-+ kde_cv_path="$XMLLINT";
-+ else
-+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xmllint"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xmllint 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xmllint"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
-+fi
-+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ XMLLINT=""
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XMLLINT=$kde_cv_path
-+
-+ fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XMLLINT "$XMLLINT"
++return shl_unload ();
+ ;
+ return 0;
+ }
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ 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=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dld_shl_unload=yes
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
-+echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
-+ HELP_SUBDIR=
-+ fi
-+fi
-+
-+
-+ echo "$as_me:$LINENO: checking for xslt-config" >&5
-+echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
-+ if test -n "$XSLT_CONFIG"; then
-+ kde_cv_path="$XSLT_CONFIG";
-+ else
-+ kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26758,14 +29326,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_unload=no
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/xslt-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/xslt-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/xslt-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/xslt-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
++ ac_cv_lib_dld_shl_unload=no
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
+
-+
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+ HELP_SUBDIR=
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ XSLT_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$XSLT_CONFIG"; then
-+ vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000007; then
-+ LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-+ LIBXSLT_RPATH=
-+ for args in $LIBXSLT_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-+
-+ else
-+ { echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
-+echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
-+ HELP_SUBDIR=
-+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
--if test $ac_cv_lib_dld_shl_unload = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
--LIBDL="-ldld"
--ac_cv_have_shload=yes
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBXSLT_RPATH=
-+ LIBXML_RPATH=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS"; then
-+ include_XSLTFILTERS_TRUE=
-+ include_XSLTFILTERS_FALSE='#'
-+else
-+ include_XSLTFILTERS_TRUE='#'
-+ include_XSLTFILTERS_FALSE=
-+fi
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for freetype-config" >&5
-+echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
-+ if test -n "$FREETYPE_CONFIG"; then
-+ kde_cv_path="$FREETYPE_CONFIG";
-+ else
-+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/freetype-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/freetype-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/freetype-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/freetype-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
+ LIBDL="-ldld"
+@@ -26779,8 +29348,8 @@
- fi
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-+ fi
-
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-
-+ { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
-+echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
-
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ FREETYPE_CONFIG=$kde_cv_path
-
- echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
--if test "${ac_cv_type_size_t+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26791,35 +29360,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
-if ((size_t *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (size_t))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_type_size_t=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ fi
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26828,20 +29411,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_type_size_t=no
+ fi
+
-+if test -n "$FREETYPE_CONFIG"; then
-+ vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5000000
-+ then
-+ LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-+ LIBFREETYPE_RPATH=
-+ for args in $LIBFREETYPE_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-+ 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;}
-+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
--if test "${ac_cv_sizeof_size_t+set}" = set; then
-+
-+
-+
-+
-+
-+
-+ echo "$as_me:$LINENO: checking for libart2-config" >&5
-+echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
-+ if test -n "$LIBART_CONFIG"; then
-+ kde_cv_path="$LIBART_CONFIG";
-+ else
-+ kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test "$ac_cv_type_size_t" = yes; then
+ if test "$ac_cv_type_size_t" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -26854,10 +29438,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -26865,23 +29450,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26894,10 +29492,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/libart2-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/libart2-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/libart2-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/libart2-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -26905,23 +29504,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=$ac_mid; break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26930,30 +29542,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
@@ -45952,97 +30903,141 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -26961,23 +29575,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -26990,10 +29617,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
--test_array [0] = 0
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -27001,23 +29629,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_lo=$ac_mid; break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ fi
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27026,23 +29667,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
@@ -46050,484 +31045,429 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27054,10 +29698,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
-+ { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
-+echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -27065,23 +29710,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=$ac_mid
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ LIBART_CONFIG=$kde_cv_path
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27090,24 +29748,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_size_t=$ac_lo;;
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; } ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+ fi
-+
-+
-+if test -n "$LIBART_CONFIG"; then
-+ vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2003008
-+ then
-+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+ LIBART_RPATH=
-+ for args in $LIBART_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBART_RPATH="$LIBART_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBART 1
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
+@@ -27115,8 +29769,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
-long longval () { return (long) (sizeof (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
++ typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27125,35 +29780,44 @@
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (size_t))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (size_t))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
else
-- {
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (size_t))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
-+ { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
-+echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
-+ fi
-+fi
++ return ferror (f) || fclose (f) != 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./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>&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof_size_t=`cat conftest.val`
-+
-+
-+
-+
-+
-+# Check for fontconfig
-+
-+ echo "$as_me:$LINENO: checking for fontconfig-config" >&5
-+echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
-+ if test -n "$FONTCONFIG_CONFIG"; then
-+ kde_cv_path="$FONTCONFIG_CONFIG";
-+ else
-+ kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27164,29 +29828,28 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
--( exit $ac_status )
+ ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f conftest.val
--else
-- ac_cv_sizeof_size_t=0
--fi
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/fontconfig-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/fontconfig-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/fontconfig-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/fontconfig-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
++ { (exit 77); exit 77; }; }
fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ else
+ ac_cv_sizeof_size_t=0
+ fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
--_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
- echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
--if test "${ac_cv_type_unsigned_long+set}" = set; then
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+
-+ echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+ if test -n "$PKGCONFIG"; then
-+ kde_cv_path="$PKGCONFIG";
-+ else
-+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+@@ -27197,35 +29860,49 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
-if ((unsigned long *) 0)
-- return 0;
++if ((ac__type_new_ *) 0)
+ return 0;
-if (sizeof (unsigned long))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_type_unsigned_long=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27234,20 +29911,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-+ fi
-+ IFS=$kde_save_IFS
++ ac_cv_type_unsigned_long=no
+ fi
+
-+ for dir in $dirs; do
-+ if test -x "$dir/pkg-config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pkg-config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pkg-config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
--if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$ac_cv_type_unsigned_long" = yes; then
++{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
++echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$ac_cv_type_unsigned_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+@@ -27260,10 +29938,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -27271,23 +29950,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27300,10 +29992,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
--test_array [0] = 0
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
-+echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PKGCONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ FONTCONFIG_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
+ ;
+@@ -27311,23 +30004,36 @@
+ }
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=$ac_mid; break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27336,30 +30042,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
@@ -46535,113 +31475,141 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ fi
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
--test_array [0] = 0
-+if test -n "$FONTCONFIG_CONFIG"; then
-+ vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
+ ;
+@@ -27367,23 +30075,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27396,10 +30117,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FONTCONFIG 1
+ ;
+@@ -27407,23 +30129,36 @@
+ }
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_lo=$ac_mid; break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27432,23 +30167,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
@@ -46649,970 +31617,528 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+ fi
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo= ac_hi=
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_lo= ac_hi=
+ fi
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
-+
-+
-+if test -z "$LIBART_LIBS"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27460,10 +30198,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
--test_array [0] = 0
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
-- ;
-- return 0;
--}
-+if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_KARBONTEXT 1
+ ;
+@@ -27471,23 +30210,36 @@
+ }
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_hi=$ac_mid
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27496,24 +30248,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; } ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for Readline library" >&5
-+echo $ECHO_N "checking for Readline library... $ECHO_C" >&6
-+
-+kexi_cv_lib_readline=no
-+ac_save_LIBS="$LIBS"
-+# Note: $LIBCURSES is permitted to be empty.
-+for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
-+do
-+ LIBS="$ac_save_LIBS $LIBREADLINE"
-+ if test "$cross_compiling" = yes; then
-+
-+ # action if cross compiling
-+ kexi_cv_lib_readline=no
-+
- else
+-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27522,37 +50598,22 @@
- cat confdefs.h >>conftest.$ac_ext
+ _ACEOF
+@@ -27521,8 +30269,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
+ $ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+
-+ /* program */
++ typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
--int
--main ()
--{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
+ int
+@@ -27531,35 +30280,44 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
- exit (1);
- if (((long) (sizeof (unsigned long))) < 0)
-- {
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
- long i = longval ();
- if (i != ((long) (sizeof (unsigned long))))
- exit (1);
-- fprintf (f, "%ld\n", i);
-- }
-- else
-- {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
- unsigned long i = ulongval ();
- if (i != ((long) (sizeof (unsigned long))))
- exit (1);
-- fprintf (f, "%lu\n", i);
-- }
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
- exit (ferror (f) || fclose (f) != 0);
-+#include <readline/readline.h>
++ return ferror (f) || fclose (f) != 0;
-- ;
-- return 0;
-+main(int argc, char **argv)
-+{
-+ /* Note: don't actually call readline, since it may block;
-+ * We just want to see if it (dynamic) linked in okay.
-+ */
-+ if (argc == 0) /* never true */
-+ readline(0);
-+ exit(0);
+ ;
+ return 0;
}
-+
_ACEOF
rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -27565,1752 +50626,1673 @@
+-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
-- ac_cv_sizeof_unsigned_long=`cat conftest.val`
-+
-+ # action if true
-+ kexi_cv_lib_readline=yes
-+
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+@@ -27570,30 +30328,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&5
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+
-+ # action if false
-+ kexi_cv_lib_readline=no
-+
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-+
-+ if test "$kexi_cv_lib_readline" = yes ; then break ; fi
-+done
-+# restore LIBS
-+LIBS="$ac_save_LIBS"
-+
-+if test "$kexi_cv_lib_readline" = no ; then
-+ LIBREADLINE=""
-+ echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
-+echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6
-+else
-+ echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
-+echo "${ECHO_T}$LIBREADLINE" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_READLINE 1
-+_ACEOF
-+
- fi
--rm -f conftest.val
-+
-+
-+
-+if test "$kexi_cv_lib_readline" = "yes"; then
-+ have_readline_TRUE=
-+ have_readline_FALSE='#'
+ rm -f conftest.val
else
-- ac_cv_sizeof_unsigned_long=0
-+ have_readline_TRUE='#'
-+ have_readline_FALSE=
+ ac_cv_sizeof_unsigned_long=0
fi
-+
-+
-+
-+
-+
-+#KEXI_VERSION=
-+LIB_KEXI_KMDI='-lkmdi'
-+
-+LIB_KEXI_KMDI_INCLUDES=''
-+
-+
-+
-+
-+# Check whether --enable-mysql or --disable-mysql was given.
-+if test "${enable_mysql+set}" = set; then
-+ enableval="$enable_mysql"
-+ mysql_plugin=$enableval
-+else
-+ mysql_plugin=yes
-+fi;
-+
-+if test "x$mysql_plugin" = "xyes"; then
-+ compile_mysql_plugin="yes"
-+else
-+ compile_mysql_plugin="no"
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
--_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
-+# Check whether --with-mysql_includes or --without-mysql_includes was given.
-+if test "${with_mysql_includes+set}" = set; then
-+ withval="$with_mysql_includes"
- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ ac_mysql_incdir=$withval
-
--int
--main ()
--{
-+else
-+ ac_mysql_incdir=
-
-- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-- choke me
-- #endif
-+fi;
-+
-+
-+# Check whether --with-mysql_libraries or --without-mysql_libraries was given.
-+if test "${with_mysql_libraries+set}" = set; then
-+ withval="$with_mysql_libraries"
-+
-+ ac_mysql_libdir=$withval
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++ { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27614,35 +30371,48 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_mysql_libdir=
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-+fi;
-+
-+
-+echo "$as_me:$LINENO: checking for MySQL" >&5
-+echo $ECHO_N "checking for MySQL... $ECHO_C" >&6
-+
-+if test "$compile_mysql_plugin" = "yes"; then
-+ if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
-+ echo "$as_me:$LINENO: checking for MySQL headers" >&5
-+echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6
-+ mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
-+
-+mysql_incdir=NO
-+for i in $mysql_incdirs;
-+do
-+ for j in mysql/mysql.h;
-+ do
-+ echo "configure: 50741: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ mysql_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $mysql_incdir/mysql/mysql.h; then
-+ MYSQL_INC=$mysql_incdir
-+ echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
-+echo "${ECHO_T}$MYSQL_INC" >&6
-+
-+ else
-+ compile_mysql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for MySQL libraries" >&5
-+echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6
-+ mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+mysql_libdir=NO
-+for i in $mysql_libdirs;
-+do
-+ for j in mysql/libmysqlclient.so;
-+ do
-+ echo "configure: 50770: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ mysql_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $mysql_libdir/mysql/libmysqlclient.so; then
-+ MYSQL_LIBS=$mysql_libdir
-+ echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
-+echo "${ECHO_T}$MYSQL_LIBS" >&6
-+
-+ else
-+ compile_mysql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+ else
-+
-+ echo "$as_me:$LINENO: checking for mysql_config" >&5
-+echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6
-+ if test -n "$MYSQL_CONFIG"; then
-+ kde_cv_path="$MYSQL_CONFIG";
-+ else
-+ kde_cache=`echo mysql_config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-+ fi
-+ IFS=$kde_save_IFS
-+
-+ for dir in $dirs; do
-+ if test -x "$dir/mysql_config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/mysql_config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/mysql_config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/mysql_config"
-+ break
-+ fi
-+ fi
-+ done
-+
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- { { echo "$as_me:$LINENO: error:
-- Apparently on your system our assumption sizeof size_t == sizeof unsigned long
-- does not apply. Please mail kde-devel at kde.org with a description of your system!
-- " >&5
--echo "$as_me: 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!
-- " >&2;}
-- { (exit 1); exit 1; }; }
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error:
+ Apparently on your system our assumption sizeof size_t == sizeof unsigned long
+ does not apply. Please mail kde-devel at kde.org with a description of your system!
+@@ -27654,18 +30424,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
- 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
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ MYSQL_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ if test -n "$MYSQL_CONFIG"; then
-+ mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1`
-+ mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
-+ MYSQL_INC=$mysql_incdir
-+ MYSQL_LIBS=$mysql_libdir
-+
-+
-+ compile_mypsql_plugin="yes"
-+ echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
-+echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6
-+ else
-+ compile_mysql_plugin="no"
-+ fi
-+ fi
-+else
-+ { echo "$as_me:$LINENO: Not attempting to configure MySQL as requested" >&5
-+echo "$as_me: Not attempting to configure MySQL as requested" >&6;}
-+fi
-+
-+
-+
-+if test "$compile_mysql_plugin" = "yes"; then
-+ compile_mysql_plugin_TRUE=
-+ compile_mysql_plugin_FALSE='#'
-+else
-+ compile_mysql_plugin_TRUE='#'
-+ compile_mysql_plugin_FALSE=
-+fi
-+
-+
-+
-+
-+# Check whether --enable-pgsql or --disable-pgsql was given.
-+if test "${enable_pgsql+set}" = set; then
-+ enableval="$enable_pgsql"
-+ pgsql_plugin=$enableval
-+else
-+ pgsql_plugin=yes
-+fi;
-+
-+if test "x$pgsql_plugin" = "xyes"; then
-+ compile_pgsql_plugin="yes"
-+else
-+ compile_pgsql_plugin="no"
-+fi
-+
-+
-+# Check whether --with-pgsql-includes or --without-pgsql-includes was given.
-+if test "${with_pgsql_includes+set}" = set; then
-+ withval="$with_pgsql_includes"
-+
-+ ac_pgsql_incdir=$withval
-+
-+else
-+ ac_pgsql_incdir=
-+
-+fi;
-+
-+
-+# Check whether --with-pgsql-libraries or --without-pgsql-libraries was given.
-+if test "${with_pgsql_libraries+set}" = set; then
-+ withval="$with_pgsql_libraries"
-+
-+ ac_pgsql_libdir=$withval
-+
-+else
-+ ac_pgsql_libdir=
-+
-+fi;
-+
-+
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
-+echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6
-+ pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
-+
-+pgsql_incdir=NO
-+for i in $pgsql_incdirs;
-+do
-+ for j in libpq-fe.h;
-+ do
-+ echo "configure: 50938: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pgsql_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pgsql_incdir/libpq-fe.h; then
-+ PG_INCDIR=$pgsql_incdir
-+ echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
-+echo "${ECHO_T}$PG_INCDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+
-+ echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6
-+ pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+pgsql_libdir=NO
-+for i in $pgsql_libdirs;
-+do
-+ for j in libpq.so;
-+ do
-+ echo "configure: 50967: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pgsql_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pgsql_libdir/libpq.so; then
-+ PG_LIBDIR=$pgsql_libdir
-+ echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
-+echo "${ECHO_T}$PG_LIBDIR" >&6
-+
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
-+ else
-+
-+ echo "$as_me:$LINENO: checking for pg_config" >&5
-+echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
-+ if test -n "$PG_CONFIG"; then
-+ kde_cv_path="$PG_CONFIG";
-+ else
-+ kde_cache=`echo pg_config | sed 'y%./+-%__p_%'`
-+
-+ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ { echo "$as_me:$LINENO: checking for PIE support" >&5
++echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+ if test "${kde_cv_val_pie_support+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ kde_cv_path="NONE"
-+ kde_save_IFS=$IFS
-+ IFS=':'
-+ dirs=""
-+ for dir in $PATH; do
-+ dirs="$dirs $dir"
-+ done
-+ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-+ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-+ fi
-+ IFS=$kde_save_IFS
-+ for dir in $dirs; do
-+ if test -x "$dir/pg_config"; then
-+ if test -n ""
-+ then
-+ evalstr="$dir/pg_config 2>&1 "
-+ if eval $evalstr; then
-+ kde_cv_path="$dir/pg_config"
-+ break
-+ fi
-+ else
-+ kde_cv_path="$dir/pg_config"
-+ break
-+ fi
-+ fi
-+ done
-
+-
- 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
-+ eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-+fi
-
-- safe_CXXFLAGS=$CXXFLAGS
-- safe_LDFLAGS=$LDFLAGS
-- CXXFLAGS="$CXXFLAGS -fPIE"
-- LDFLAGS="$LDFLAGS -pie"
-
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--int foo;
--int
--main ()
--{
-+ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ 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'
+@@ -27695,23 +30465,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { 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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- kde_cv_val_pie_support=yes
-+ fi
-+
-+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+ else
-+ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6
-+ PG_CONFIG=$kde_cv_path
-+
-+ fi
-+
-+
-+ if test -n "$PG_CONFIG"; then
-+ pgsql_incdir=`$PG_CONFIG --includedir`
-+ pgsql_libdir=`$PG_CONFIG --libdir`
-+ PG_INCDIR=$pgsql_incdir
-+ PG_LIBDIR=$pgsql_libdir
-+
-+ compile_pgsql_plugin="yes"
-+ echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
-+echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6
-+ else
-+ compile_pgsql_plugin="no"
-+ fi
-+ fi
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27720,8 +30503,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-kde_cv_val_pie_support=no
-+ { echo "$as_me:$LINENO: Not attempting to configure PostgreSQL as requested" >&5
-+echo "$as_me: Not attempting to configure PostgreSQL as requested" >&6;}
++ kde_cv_val_pie_support=no
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS=$safe_CXXFLAGS
-- LDFLAGS=$safe_LDFLAGS
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -27735,26 +30519,26 @@
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ compile_pgsql_plugin_TRUE=
-+ compile_pgsql_plugin_FALSE='#'
-+else
-+ compile_pgsql_plugin_TRUE='#'
-+ compile_pgsql_plugin_FALSE=
fi
-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
- echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
- # Check whether --enable-pie or --disable-pie was given.
--if test "${enable_pie+set}" = set; then
++ # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
- enableval="$enable_pie"
- kde_has_pie_support=$enableval
-+
-+
-+
-+# Check whether --with-pqxx-includes or --without-pqxx-includes was given.
-+if test "${with_pqxx_includes+set}" = set; then
-+ withval="$with_pqxx_includes"
-+
-+ ac_pqxx_incdir=$withval
-+
++ enableval=$enable_pie; kde_has_pie_support=$enableval
else
-- kde_has_pie_support=detect
-+ ac_pqxx_incdir=
+ kde_has_pie_support=detect
+-fi;
++fi
+
- fi;
-- if test "$kde_has_pie_support" = "detect"; then
-- kde_has_pie_support=$kde_cv_val_pie_support
-- fi
+ if test "$kde_has_pie_support" = "detect"; then
+ kde_has_pie_support=$kde_cv_val_pie_support
+ fi
- echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-echo "${ECHO_T}$kde_has_pie_support" >&6
-+# Check whether --with-pqxx-libraries or --without-pqxx-libraries was given.
-+if test "${with_pqxx_libraries+set}" = set; then
-+ withval="$with_pqxx_libraries"
++ { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
-- KDE_USE_FPIE=""
-- KDE_USE_PIE=""
-+ ac_pqxx_libdir=$withval
-
-+else
-+ ac_pqxx_libdir=
-
-+fi;
-
-
-- if test "$kde_has_pie_support" = "yes"; then
-- KDE_USE_FPIE="-fPIE"
-- KDE_USE_PIE="-pie"
-- fi
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6
-+ pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
-
-+pqxx_incdir=NO
-+for i in $pqxx_incdirs;
-+do
-+ for j in pqxx/pqxx;
-+ do
-+ echo "configure: 51118: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pqxx_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--# darwin needs this to initialize the environment
-+ if test -r $pqxx_incdir/pqxx/pqxx; then
-+ PQXX_INCDIR=$pqxx_incdir
-+ echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
-+echo "${ECHO_T}$PQXX_INCDIR" >&6
-
--for ac_header in crt_externs.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ KDE_USE_FPIE=""
+ KDE_USE_PIE=""
+@@ -27773,18 +30557,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ fi
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
-- # Is the header compilable?
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27795,23 +30580,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -27820,15 +30618,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6
-+ pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+
-+pqxx_libdir=NO
-+for i in $pqxx_libdirs;
-+do
-+ for j in libpqxx.so;
-+ do
-+ echo "configure: 51149: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ pqxx_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test -r $pqxx_libdir/libpqxx.so; then
-+ PQXX_LIBDIR=$pqxx_libdir
-+ echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
-+echo "${ECHO_T}$PQXX_LIBDIR" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27837,8 +30636,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
-- ac_cpp_err=
-+ compile_pgsql_plugin="no"
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
- fi
--else
-- ac_cpp_err=yes
++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
+@@ -27862,9 +30666,10 @@
+
+ ac_header_preproc=no
fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27888,25 +30693,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -47621,8010 +32147,2678 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ compile_pgsql_plugin_TRUE=
-+ compile_pgsql_plugin_FALSE='#'
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ compile_pgsql_plugin_TRUE='#'
-+ compile_pgsql_plugin_FALSE=
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -27918,8 +30717,8 @@
--fi
+ done
--done
-
-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
--if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-+echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
-+echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6
-+
-+ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
-+knewstuff_libraries=""
-+knewstuff_includes=""
-+
-+if test "${ac_cv_have_knewstuff+set}" = set; then
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define _NSGetEnviron to an innocuous variant, in case <limits.h> declares _NSGetEnviron.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define _NSGetEnviron innocuous__NSGetEnviron
+@@ -27946,52 +30745,59 @@
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char _NSGetEnviron (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+ #undef _NSGetEnviron
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+knewstuff_incdir=NO
-+for i in $kde_incdirs;
-+do
-+ for j in knewstuff/downloaddialog.h;
-+ do
-+ echo "configure: 51200: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ knewstuff_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--#undef _NSGetEnviron
-+ac_knewstuff_includes="$knewstuff_incdir"
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char _NSGetEnviron ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
--choke me
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
-#else
-char (*f) () = _NSGetEnviron;
-#endif
-#ifdef __cplusplus
-}
--#endif
+ #endif
--int
--main ()
--{
+ int
+ main ()
+ {
-return f != _NSGetEnviron;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return _NSGetEnviron ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_func__NSGetEnviron=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+knewstuff_libdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in libknewstuff.so;
-+ do
-+ echo "configure: 51217: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ knewstuff_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28000,13 +30806,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__NSGetEnviron=no
-+ac_knewstuff_libraries="$knewstuff_libdir"
-+
-+if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
-+ ac_cv_have_knewstuff="have_knewstuff=no"
-+ ac_knewstuff_notfound=""
-+else
-+ have_knewstuff="yes"
++ ac_cv_func__NSGetEnviron=no
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
--if test $ac_cv_func__NSGetEnviron = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NSGETENVIRON 1
--_ACEOF
-
--fi
-+eval "$ac_cv_have_knewstuff"
-+
-+if test "$have_knewstuff" != yes; then
-+ echo "$as_me:$LINENO: result: $have_knewstuff" >&5
-+echo "${ECHO_T}$have_knewstuff" >&6
-+else
-+ echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
-+echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6
-
-+ CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
-
-+ LIB_KNEWSTUFF='-lknewstuff'
-
-+fi
-
-+echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
-+echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6
-+if test "${ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ test "$cross_compiling" = yes &&
-+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+ { (exit 1); exit 1; }; }
-+if test -r "kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp"; then
-+ ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=yes
-+else
-+ ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=no
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
-+echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6
-+if test $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp = yes; then
-+ have_internal_feedback="yes"
-
-+else
-+ have_internal_feedback="no"
-
-+fi
-
-
-+echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
-+echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6
-
-+ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
-+kfeedback_libraries=""
-+kfeedback_includes=""
-
--for ac_func in vsnprintf snprintf
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ cat >>confdefs.h <<\_ACEOF
+@@ -28027,9 +30834,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-+if test "${ac_cv_have_kfeedback+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28055,52 +30862,59 @@
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+ #undef $ac_func
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+kfeedback_incdir=NO
-+for i in $kde_incdirs;
-+do
-+ for j in kfeedbackwizard.h;
-+ do
-+ echo "configure: 51296: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kfeedback_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--#undef $ac_func
-+ac_kfeedback_includes="$kfeedback_incdir"
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
--#endif
+ #endif
--int
--main ()
--{
+ int
+ main ()
+ {
-return f != $ac_func;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return $ac_func ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_var=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+kfeedback_libdir=NO
-+for i in $kde_libdirs;
-+do
-+ for j in libkfeedbackwizard.so;
-+ do
-+ echo "configure: 51313: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ kfeedback_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28109,13 +30923,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-+ac_kfeedback_libraries="$kfeedback_libdir"
++ eval "$as_ac_var=no"
+ fi
+
-+if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then
-+ ac_cv_have_kfeedback="have_kfeedback=no"
-+ ac_kfeedback_notfound=""
-+else
-+ have_kfeedback="yes"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28132,32 +30948,32 @@
- fi
--done
-+eval "$ac_cv_have_kfeedback"
-
-+INC_KFEEDBACK=''
-+LIB_KFEEDBACK=''
-+if test "$have_kfeedback" != yes; then
-+ if test "$have_internal_feedback" = yes; then
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
-+ use_kexifb="yes"
-+ echo "$as_me:$LINENO: result: using internal" >&5
-+echo "${ECHO_T}using internal" >&6
-+ INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
-+ LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
-+ else
-+ use_kexifb="no"
-+ echo "$as_me:$LINENO: result: dont use" >&5
-+echo "${ECHO_T}dont use" >&6
-+ fi
-+else
-+ use_kexifb="no"
-+ echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
-+echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6
-
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
-
-+ LIB_KFEEDBACK='-lkfeedbackwizard'
-+fi
-
-
-
-
-# Check whether --enable-embedded or --disable-embedded was given.
--if test "${enable_embedded+set}" = set; then
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
- enableval="$enable_embedded"
- kde_use_qt_emb=$enableval
-+if test "$use_kexifb" = "yes"; then
-+ use_kexifeedback_TRUE=
-+ use_kexifeedback_FALSE='#'
++ enableval=$enable_embedded; kde_use_qt_emb=$enableval
else
-- kde_use_qt_emb=no
--
+ kde_use_qt_emb=no
+
-fi;
-+ use_kexifeedback_TRUE='#'
-+ use_kexifeedback_FALSE=
+fi
++
-# Check whether --enable-qtopia or --disable-qtopia was given.
--if test "${enable_qtopia+set}" = set; then
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
- enableval="$enable_qtopia"
- kde_use_qt_emb_palm=$enableval
--else
-- kde_use_qt_emb_palm=no
++ enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+ kde_use_qt_emb_palm=no
-fi;
-+# KexiMDB isn't built as part of Kexi right now.
-+#AC_ARG_ENABLE(keximdb,
-+# AC_HELP_STRING([--enable-keximdb],
-+# [build KexiMDB (MS Access) plugin [default=no]]),
-+# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no)
-+#
-+#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno")
++fi
++
-# Check whether --enable-mac or --disable-mac was given.
--if test "${enable_mac+set}" = set; then
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
- enableval="$enable_mac"
- kde_use_qt_mac=$enableval
-+# Check whether --enable-kexi-reports or --disable-kexi-reports was given.
-+if test "${enable_kexi_reports+set}" = set; then
-+ enableval="$enable_kexi_reports"
-+ compile_kexi_reports_plugin=$enableval
++ enableval=$enable_mac; kde_use_qt_mac=$enableval
else
-- kde_use_qt_mac=no
--
-+ compile_kexi_reports_plugin=no
- fi;
+ kde_use_qt_mac=no
--# used to disable x11-specific stuff on special platforms
--
+-fi;
++fi
++
--if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-- include_x11_TRUE=
-- include_x11_FALSE='#'
-+if test "x$compile_kexi_reports_plugin" != "xno"; then
-+ compile_kexi_reports_plugin_TRUE=
-+ compile_kexi_reports_plugin_FALSE='#'
- else
-- include_x11_TRUE='#'
-- include_x11_FALSE=
-+ compile_kexi_reports_plugin_TRUE='#'
-+ compile_kexi_reports_plugin_FALSE=
- fi
+ # used to disable x11-specific stuff on special platforms
+@@ -28173,8 +30989,8 @@
--if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+if test "$compile_kexi_reports_plugin" == "yes"; then
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-+cat >>confdefs.h <<\_ACEOF
-+#define KEXI_REPORTS_SUPPORT 1
-+_ACEOF
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
--if test "${kde_cv_have_x+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # One or both of the vars are not set, and there is no cached value.
--if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-- kde_x_includes=NO
--else
-- kde_x_includes=$x_includes
--fi
--if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-- kde_x_libraries=NO
--else
-- kde_x_libraries=$x_libraries
- fi
-
--# below we use the standard autoconf calls
--ac_x_libraries=$kde_x_libraries
--ac_x_includes=$kde_x_includes
-
-
-
-
--if test "$ac_x_includes" = NO; then
-- # Guess where to find include files, by looking for this one X11 .h file.
-- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-- # First, try using that file with no special directory specified.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$x_direct_test_include>
--_ACEOF
+ if test "${kde_cv_have_x+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28211,8 +31027,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
-+
-+if test -z ""2.4""; then
-+ version="1.5"
- else
-- ac_cpp_err=yes
-+ version=""2.4""
++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
+@@ -28279,6 +31100,7 @@
+ fi
+ done
fi
--if test -z "$ac_cpp_err"; then
-- # We can compile using X headers with no special include directory.
--ac_x_includes=
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- # Look for the header file in a standard set of common directories.
--# Check X11 before X11Rn because it is often a symlink to the current release.
-- for ac_dir in \
-- /usr/X11/include \
-- /usr/X11R6/include \
-- /usr/X11R5/include \
-- /usr/X11R4/include \
-- \
-- /usr/include/X11 \
-- /usr/include/X11R6 \
-- /usr/include/X11R5 \
-- /usr/include/X11R4 \
-- \
-- /usr/local/X11/include \
-- /usr/local/X11R6/include \
-- /usr/local/X11R5/include \
-- /usr/local/X11R4/include \
-- \
-- /usr/local/include/X11 \
-- /usr/local/include/X11R6 \
-- /usr/local/include/X11R5 \
-- /usr/local/include/X11R4 \
-- \
-- /usr/X386/include \
-- /usr/x386/include \
-- /usr/XFree86/include/X11 \
-- \
-- /usr/include \
-- /usr/local/include \
-- /usr/unsupported/include \
-- /usr/athena/include \
-- /usr/local/x11r5/include \
-- /usr/lpp/Xamples/include \
-- \
-- /usr/openwin/include \
-- /usr/openwin/share/include \
-- ; \
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
- do
-- if test -r "$ac_dir/$x_direct_test_include"; then
-- ac_x_includes=$ac_dir
-- break
-+ echo "configure: 51429: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
- fi
- done
--fi
--rm -f conftest.err conftest.$ac_ext
--fi # $ac_x_includes = NO
--
--if test "$ac_x_libraries" = NO; then
-- # Check for the libraries.
--
-- test -z "$x_direct_test_library" && x_direct_test_library=Xt
-- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+done
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
-- # See if we find them without any special options.
-- # Don't add to $LIBS permanently.
-- ac_save_LIBS="$LIBS"
-- LIBS="-l$x_direct_test_library $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <X11/Intrinsic.h>
--int
--main ()
--{
--${x_direct_test_function}(1)
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -28308,23 +31130,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- LIBS="$ac_save_LIBS"
--# We can link X programs with no special library path.
--ac_x_libraries=
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if test ! -r $python_incdir/Python.h; then
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28335,7 +31170,7 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-LIBS="$ac_save_LIBS"
--# First see if replacing the include by lib works.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-- /usr/X11/lib${kdelibsuff} \
-- /usr/X11R6/lib${kdelibsuff} \
-- /usr/X11R5/lib${kdelibsuff} \
-- /usr/X11R4/lib${kdelibsuff} \
-- \
-- /usr/lib${kdelibsuff}/X11 \
-- /usr/lib${kdelibsuff}/X11R6 \
-- /usr/lib${kdelibsuff}/X11R5 \
-- /usr/lib${kdelibsuff}/X11R4 \
-- \
-- /usr/local/X11/lib${kdelibsuff} \
-- /usr/local/X11R6/lib${kdelibsuff} \
-- /usr/local/X11R5/lib${kdelibsuff} \
-- /usr/local/X11R4/lib${kdelibsuff} \
-- \
-- /usr/local/lib${kdelibsuff}/X11 \
-- /usr/local/lib${kdelibsuff}/X11R6 \
-- /usr/local/lib${kdelibsuff}/X11R5 \
-- /usr/local/lib${kdelibsuff}/X11R4 \
-- \
-- /usr/X386/lib${kdelibsuff} \
-- /usr/x386/lib${kdelibsuff} \
-- /usr/XFree86/lib${kdelibsuff}/X11 \
-- \
-- /usr/lib${kdelibsuff} \
-- /usr/local/lib${kdelibsuff} \
-- /usr/unsupported/lib${kdelibsuff} \
-- /usr/athena/lib${kdelibsuff} \
-- /usr/local/x11r5/lib${kdelibsuff} \
-- /usr/lpp/Xamples/lib${kdelibsuff} \
-- /lib/usr/lib${kdelibsuff}/X11 \
-- \
-- /usr/openwin/lib${kdelibsuff} \
-- /usr/openwin/share/lib${kdelibsuff} \
-- ; \
-+python_incdir=NO
-+for i in $python_incdirs;
- do
-- for ac_extension in a so sl; do
-- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-- ac_x_libraries=$ac_dir
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 51445: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
- break 2
- fi
++ LIBS="$ac_save_LIBS"
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+@@ -28383,6 +31218,7 @@
done
done
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi # $ac_x_libraries = NO
--
--case "$host" in
--mips-sgi-irix6*)
-- ;;
--*-*-solaris*)
-- ;;
--*)
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -28393,21 +31229,26 @@
+ *-*-solaris*)
+ ;;
+ *)
- rm -fr conftest.dir
--if mkdir conftest.dir; then
-- cd conftest.dir
++ rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+ cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-- cat >Imakefile <<'_ACEOF'
+ cat >Imakefile <<'_ACEOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
--_ACEOF
++incroot:
++ @echo incroot='${INCROOT}'
++usrlibdir:
++ @echo usrlibdir='${USRLIBDIR}'
++libdir:
++ @echo libdir='${LIBDIR}'
+ _ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-- for ac_extension in a so sl; do
++ 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 &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
-- ac_im_usrlibdir=$ac_im_libdir; break
-- fi
-- done
-- # Screen out bogus values from the imake configuration. They are
-- # 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
++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
++ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+@@ -28415,7 +31256,7 @@
+ # bogus both because they are the default anyway, and because
+ # using them would break gcc on systems where it needs fixed includes.
+ case $ac_im_incroot in
- /usr/include) ;;
-- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-- esac
-- case $ac_im_usrlibdir in
-- /usr/lib | /lib) ;;
-- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-- esac
-- fi
-- cd ..
++ /usr/include) ac_x_includes= ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+@@ -28424,7 +31265,7 @@
+ esac
+ fi
+ cd ..
- rm -fr conftest.dir
--fi
-
-- if test -z "$ac_x_includes"; then
-- ac_x_includes="."
-- fi
-- if test -z "$ac_x_libraries"; then
-- ac_x_libraries="/usr/lib${kdelibsuff}"
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
- fi
--esac
--#from now on we use our own again
--
--# when the user already gave --x-includes, we ignore
--# what the standard autoconf macros told us.
--if test "$kde_x_includes" = NO; then
-- kde_x_includes=$ac_x_includes
--fi
--
--# for --x-libraries too
--if test "$kde_x_libraries" = NO; then
-- kde_x_libraries=$ac_x_libraries
--fi
--
--if test "$kde_x_includes" = NO; then
-- { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
--echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--if test "$kde_x_libraries" = NO; then
-- { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
--echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--# Record where we found X for the cache.
--kde_cv_have_x="have_x=yes \
-- kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
--
++ rm -f -r conftest.dir
fi
--eval "$kde_cv_have_x"
--
--if test "$have_x" != yes; then
+ if test -z "$ac_x_includes"; then
+@@ -28468,12 +31309,12 @@
+ eval "$kde_cv_have_x"
+
+ if test "$have_x" != yes; then
- echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-- no_x=yes
--else
++ { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+ no_x=yes
+ else
- echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
--fi
-+PYTHONINC=-I$python_incdir
++ { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
--if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-- X_INCLUDES=""
-- x_includes="."; else
-- x_includes=$kde_x_includes
-- X_INCLUDES="-I$x_includes"
--fi
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-
--if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-- X_LDFLAGS=""
-- x_libraries="/usr/lib"; else
-- x_libraries=$kde_x_libraries
-- X_LDFLAGS="-L$x_libraries"
--fi
--all_includes="$X_INCLUDES"
--all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 51469: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--# Check for libraries that X11R6 Xt/Xaw programs need.
--ac_save_LDFLAGS="$LDFLAGS"
--LDFLAGS="$LDFLAGS $X_LDFLAGS"
--# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
--# check for ICE first), but we must link in the order -lSM -lICE or
--# we get undefined symbols. So assume we have SM if we have ICE.
--# 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.
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28501,8 +31342,8 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
--if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+if test ! -r $python_libdir/libpython$version.so; then
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28515,39 +31356,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char IceConnectionNumber ();
--int
--main ()
--{
+ char IceConnectionNumber ();
+ int
+ main ()
+ {
-IceConnectionNumber ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return IceConnectionNumber ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_ICE_IceConnectionNumber=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 51485: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28556,14 +31410,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
--if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-- LIBSM="-lSM -lICE"
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 51501: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ LIBSM="-lSM -lICE"
fi
+@@ -28572,8 +31427,8 @@
--LDFLAGS="$ac_save_LDFLAGS"
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
+ LIB_X11='-lX11 $(LIBSOCKET)'
--LIB_X11='-lX11 $(LIBSOCKET)'
-
-echo "$as_me:$LINENO: checking for libXext" >&5
-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
--if test "${kde_cv_have_libXext+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 51529: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--kde_ldflags_safe="$LDFLAGS"
--kde_libs_safe="$LIBS"
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
--LIBS="-lXext -lX11 $LIBSOCKET"
-+PYTHONMODDIR=$python_moddir
-
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-
--#include <stdio.h>
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-
--int
--main ()
--{
-
--printf("hello Xext\n");
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28607,23 +31462,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- kde_cv_have_libXext=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28632,9 +31500,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_have_libXext=no
++ kde_cv_have_libXext=no
-+if test -z ""2.3""; then
-+ version="1.5"
-+else
-+ version=""2.3""
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
--LDFLAGS=$kde_ldflags_safe
--LIBS=$kde_libs_safe
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+@@ -28644,8 +31513,8 @@
+ fi
--fi
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 51573: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+if test ! -r $python_incdir/Python.h; then
-
-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-echo "${ECHO_T}$kde_cv_have_libXext" >&6
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 51589: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
--if test "$kde_cv_have_libXext" = "no"; then
-- { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
--can't find it itself, we stop here assuming that make wouldn't find
--them either." >&5
--echo "$as_me: error: We need a working libXext to proceed. Since configure
--can't find it itself, we stop here assuming that make wouldn't find
--them either." >&2;}
-- { (exit 1); exit 1; }; }
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
- fi
-
--LIB_XEXT="-lXext"
--QTE_NORTTI=""
-+PYTHONINC=-I$python_incdir
-
--elif test "$kde_use_qt_emb" = "yes"; then
-- CPPFLAGS=-DQWS
-- CXXFLAGS="$CXXFLAGS -fno-rtti"
-- QTE_NORTTI="-fno-rtti -DQWS"
-- X_PRE_LIBS=""
-- LIB_X11=""
-- LIB_XEXT=""
-- LIB_XRENDER=""
-- LIBSM=""
-- X_INCLUDES=""
-- X_LDFLAGS=""
-- x_includes=""
-- x_libraries=""
--elif test "$kde_use_qt_mac" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-- CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-- X_PRE_LIBS=""
-- LIB_X11=""
-- LIB_XEXT=""
-- LIB_XRENDER=""
-- LIBSM=""
-- X_INCLUDES=""
-- X_LDFLAGS=""
-- x_includes=""
-- x_libraries=""
--fi
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 51613: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 51629: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-+ if test ! -r $python_libdir/libpython$version.a; then
-
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 51645: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
-+fi
-
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-
-
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 51673: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-
-+PYTHONMODDIR=$python_moddir
-
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-
-
-- LIBPTHREAD=""
-
-- if test -n "$PTHREAD_LIBS"; then
-- if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-- LIBPTHREAD="PTHREAD"
-- else
-- PTHREAD_LIBS_save="$PTHREAD_LIBS"
-- PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+ if test "$kde_cv_have_libXext" = "no"; then
+ { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28707,8 +31576,8 @@
+ else
+ PTHREAD_LIBS_save="$PTHREAD_LIBS"
+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
- echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
-- kde_save_LDFLAGS="$LDFLAGS"
-- kde_save_LIBS="$LIBS"
-- LDFLAGS="$LDFLAGS $all_libraries"
-- case $host_os in
-- aix*) LDFLAGS="-brtl $LDFLAGS"
-- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-- ;;
-- esac
-- as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+ kde_save_LDFLAGS="$LDFLAGS"
+ kde_save_LIBS="$LIBS"
+@@ -28719,9 +31588,9 @@
+ ;;
+ esac
+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$PTHREAD_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -28733,39 +31602,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char pthread_create ();
--int
--main ()
--{
+ char pthread_create ();
+ int
+ main ()
+ {
-pthread_create ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return pthread_create ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_Lib=yes"
-+if test -z ""2.2""; then
-+ version="1.5"
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28774,14 +31656,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-eval "$as_ac_Lib=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-- LIBPTHREAD="$PTHREAD_LIBS_save"
-+ version=""2.2""
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ LIBPTHREAD="$PTHREAD_LIBS_save"
fi
+@@ -28794,8 +31678,8 @@
+ fi
-- LDFLAGS="$kde_save_LDFLAGS"
-- LIBS="$kde_save_LIBS"
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-
-- PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 51717: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
- fi
-- fi
-+ done
-+done
-
-- if test -z "$LIBPTHREAD"; then
+ if test -z "$LIBPTHREAD"; then
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
--if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+if test ! -r $python_incdir/Python.h; then
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28808,39 +31692,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char pthread_create ();
--int
--main ()
--{
+ char pthread_create ();
+ int
+ main ()
+ {
-pthread_create ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++return pthread_create ();
+ ;
+ 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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_pthread_pthread_create=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 51733: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28849,14 +31746,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-- LIBPTHREAD="-lpthread"
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+ LIBPTHREAD="-lpthread"
fi
+@@ -28864,8 +31762,8 @@
+ fi
-- fi
-+PYTHONINC=-I$python_incdir
-
-- if test -z "$LIBPTHREAD" ; then
+ if test -z "$LIBPTHREAD" ; then
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-- kde_safe_libs=$LIBS
-- LIBS="$LIBS -lpthread"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <pthread.h>
--int
--main ()
--{
--(void)pthread_create(0,0,0,0);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ kde_safe_libs=$LIBS
+ LIBS="$LIBS -lpthread"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28884,38 +31782,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 51757: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- LIBPTHREAD="-lpthread"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 51773: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ LIBPTHREAD="-lpthread"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-+ if test ! -r $python_libdir/libpython$version.a; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- LIBS=$kde_safe_libs
-- fi
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 51789: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -28931,16 +31843,15 @@
+ USE_THREADS=""
+ if test -z "$LIBPTHREAD"; then
-- if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-- LIBPTHREAD=""
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
- fi
-+fi
-
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-
-
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 51817: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-- USE_THREADS=""
-- if test -z "$LIBPTHREAD"; then
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-
-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
--kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+PYTHONMODDIR=$python_moddir
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-
+-
- 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'
-
-
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -pthread"
-- 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;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ 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'
+@@ -28967,23 +31878,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { 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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
-+if test -z ""2.1""; then
-+ version="1.5"
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+ version=""2.1""
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -28992,7 +31916,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+ fi
+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 51861: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 51877: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -29006,13 +31932,13 @@
fi
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- :
-- USE_THREADS="-D_THREAD_SAFE -pthread"
--else
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- :
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 51901: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.so; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 51917: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+ if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 51933: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
fi
+@@ -29024,16 +31950,15 @@
+ case $host_os in
+ solaris*)
-- fi
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-
-
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 51961: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-- case $host_os in
-- solaris*)
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
-
-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
--kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+PYTHONMODDIR=$python_moddir
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-
+-
- 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'
-
-
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -mt"
-- 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;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++ 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'
+@@ -29060,23 +31985,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { 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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
-+if test -z ""2.0""; then
-+ version="1.5"
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+ version=""2.0""
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29085,7 +32023,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -29099,13 +32039,13 @@
+ fi
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-
--fi
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- :
-- USE_THREADS="-mt"
--else
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-mt"
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- :
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 52005: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 52021: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
fi
+@@ -29132,17 +32072,17 @@
-- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-- ;;
-- freebsd*)
-- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-- ;;
-- aix*)
-- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-- LIBPTHREAD="$LIBPTHREAD -lc_r"
-- ;;
-- linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-- if test "$CXX" = "KCC"; then
-- CXXFLAGS="$CXXFLAGS --thread_safe"
-- NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-- fi
-- ;;
-- *)
-- ;;
-- esac
-+PYTHONINC=-I$python_incdir
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 52045: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-+if test ! -r $python_libdir/libpython$version.so; then
-
-echo "$as_me:$LINENO: checking for extra includes" >&5
-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 52061: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
-# Check whether --with-extra-includes or --without-extra-includes was given.
--if test "${with_extra_includes+set}" = set; then
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
- withval="$with_extra_includes"
- kde_use_extra_includes="$withval"
--else
-- kde_use_extra_includes=NONE
-+ if test ! -r $python_libdir/libpython$version.a; then
++ withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+ kde_use_extra_includes=NONE
-fi;
--kde_extra_includes=
--if test -n "$kde_use_extra_includes" && \
-- test "$kde_use_extra_includes" != "NONE"; then
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 52077: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-- ac_save_ifs=$IFS
-- IFS=':'
-- for dir in $kde_use_extra_includes; do
-- kde_extra_includes="$kde_extra_includes $dir"
-- USER_INCLUDES="$USER_INCLUDES -I$dir"
-- done
-- IFS=$ac_save_ifs
-- kde_use_extra_includes="added"
--else
-- kde_use_extra_includes="no"
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+ test "$kde_use_extra_includes" != "NONE"; then
+@@ -29160,21 +32100,21 @@
fi
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
-+fi
-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
--kde_extra_libs=
+ kde_extra_libs=
-echo "$as_me:$LINENO: checking for extra libs" >&5
-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 52105: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
-# Check whether --with-extra-libs or --without-extra-libs was given.
--if test "${with_extra_libs+set}" = set; then
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
- withval="$with_extra_libs"
- kde_use_extra_libs=$withval
--else
-- kde_use_extra_libs=NONE
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
-+fi
++ withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+ kde_use_extra_libs=NONE
-fi;
--if test -n "$kde_use_extra_libs" && \
-- test "$kde_use_extra_libs" != "NONE"; then
-+PYTHONMODDIR=$python_moddir
-
-- ac_save_ifs=$IFS
-- IFS=':'
-- for dir in $kde_use_extra_libs; do
-- kde_extra_libs="$kde_extra_libs $dir"
-- KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-- USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-- done
-- IFS=$ac_save_ifs
-- kde_use_extra_libs="added"
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++fi
+
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
-+
-+
-+
-+
-+if test -z ""; then
-+ version="1.5"
- else
-- kde_use_extra_libs="no"
-+ version=""
- fi
+ if test -n "$kde_use_extra_libs" && \
+ test "$kde_use_extra_libs" != "NONE"; then
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+@@ -29193,14 +32133,14 @@
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-echo "${ECHO_T}$kde_use_extra_libs" >&6
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in Python.h;
-+ do
-+ echo "configure: 52149: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
-+if test ! -r $python_incdir/Python.h; then
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+ for j in python$version/Python.h;
-+ do
-+ echo "configure: 52165: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_incdir=$i
-+ break 2
-+ fi
-+ done
-+done
-+ python_incdir=$python_incdir/python$version
-+ if test ! -r $python_incdir/Python.h; then
-+ python_incdir=no
-+ fi
-+fi
-echo "$as_me:$LINENO: checking for libz" >&5
-echo $ECHO_N "checking for libz... $ECHO_C" >&6
--if test "${ac_cv_lib_z+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+PYTHONINC=-I$python_incdir
-
--kde_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-
--#include<zlib.h>
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.so;
-+ do
-+ echo "configure: 52189: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
--int
--main ()
--{
-+if test ! -r $python_libdir/libpython$version.so; then
-
-- char buf[42];
-- gzFile f = (gzFile) 0;
-- /* this would segfault.. but we only link, don't run */
-- (void) gzgets(f, buf, sizeof(buf));
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in libpython$version.a;
-+ do
-+ echo "configure: 52205: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
-
-- return (zlibVersion() == ZLIB_VERSION);
-+ if test ! -r $python_libdir/libpython$version.a; then
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29234,23 +32174,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "ac_cv_lib_z='-lz'"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/config/libpython$version.a;
-+ do
-+ echo "configure: 52221: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_libdir=$i
-+ break 2
-+ fi
-+ done
-+done
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29259,8 +32212,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_z=no"
-+ python_libdir=$python_libdir/python$version/config
-+ if test ! -r $python_libdir/libpython$version.a; then
-+ python_libdir=no
-+ fi
-+ fi
++ eval "ac_cv_lib_z=no"
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29274,8 +32228,8 @@
+ _ACEOF
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+ LIBPYTHON=-lpython$version
- fi
--if test ! "$ac_cv_lib_z" = no; then
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBZ 1
--_ACEOF
--
-- LIBZ="$ac_cv_lib_z"
+ LIBZ="$ac_cv_lib_z"
- echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-echo "${ECHO_T}$ac_cv_lib_z" >&6
--else
-- { { echo "$as_me:$LINENO: error: not found.
-- Possibly configure picks up an outdated version
-- installed by XFree86. Remove it from your system.
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not found.
+ Possibly configure picks up an outdated version
+@@ -29295,8 +32249,8 @@
-- Check your installation and look into config.log" >&5
--echo "$as_me: error: not found.
-- Possibly configure picks up an outdated version
-- installed by XFree86. Remove it from your system.
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+ for j in python$version/copy.py;
-+ do
-+ echo "configure: 52249: $i/$j" >&5
-+ if test -r "$i/$j"; then
-+ echo "taking that" >&5
-+ python_moddir=$i
-+ break 2
-+ fi
-+ done
-+done
-- Check your installation and look into config.log" >&2;}
-- { (exit 1); exit 1; }; }
-- LIBZ=""
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+ python_moddir=no
- fi
-+PYTHONMODDIR=$python_moddir
-
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-
-+if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
-+ LIBPYTHON=$kde_orig_LIBPYTHON
-+ test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+ test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-
--
-echo "$as_me:$LINENO: checking for libpng" >&5
-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
--if test "${ac_cv_lib_png+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ kde_python_link_found=no
-
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
- fi
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -29319,15 +52301,13 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include<png.h>
-+#include <Python.h>
-
- int
- main ()
- {
-
-- png_structp png_ptr = png_create_read_struct( /* image ptr */
-- PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-- return( png_ptr != 0 );
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
-@@ -29354,126 +52334,62 @@
+@@ -29332,23 +32286,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
-- eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-+ kde_cv_try_link_python_normal=yes
- else
+@@ -29357,9 +32324,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_png=no"
-+kde_cv_try_link_python_normal=no
++ eval "ac_cv_lib_png=no"
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS="$kde_save_LIBS"
+@@ -29374,19 +32342,19 @@
- fi
--if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
+ LIBPNG="$ac_cv_lib_png"
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBPNG 1
--_ACEOF
-
-- LIBPNG="$ac_cv_lib_png"
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
- echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-echo "${ECHO_T}$ac_cv_lib_png" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- LIBPNG=""
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBPNG=""
fi
-+fi
-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
--if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--void jpeg_CreateDecompress();
--#ifdef __cplusplus
--}
--#endif
-+if test "$kde_python_link_found" = no; then
-
--int
--main ()
--{
--jpeg_CreateDecompress();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29419,23 +32387,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++if { (ac_try="$ac_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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -29444,8 +32425,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-eval "ac_cv_lib_jpeg_6b=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
--
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ eval "ac_cv_lib_jpeg_6b=no"
fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29456,14 +32438,14 @@
--
--if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-- LIBJPEG="$ac_cv_lib_jpeg_6b"
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_6b"
- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
--else
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
-echo "$as_me:$LINENO: checking for libjpeg" >&5
-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
--if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+@@ -29496,23 +32478,36 @@
+ }
_ACEOF
-@@ -29481,18 +52397,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--void jpeg_CreateDecompress();
--#ifdef __cplusplus
--}
--#endif
-+#include <Python.h>
-
- int
- main ()
- {
--jpeg_CreateDecompress();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -29509,676 +52421,520 @@
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
+ 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_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "ac_cv_lib_jpeg_normal=-ljpeg"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
+@@ -29521,8 +32516,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-eval "ac_cv_lib_jpeg_normal=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
--
--fi
--
--
--if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-- LIBJPEG="$ac_cv_lib_jpeg_normal"
++ eval "ac_cv_lib_jpeg_normal=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29533,11 +32529,11 @@
+
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_normal"
- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
--else
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--
-- LIBJPEG=
--
--
--fi
--
--
--
--fi
--
--
--
--jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
--
--jpeg_incdir=NO
--for i in $jpeg_incdirs;
--do
-- for j in jpeglib.h;
-- do
-- echo "configure: 29562: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- jpeg_incdir=$i
-- break 2
-- fi
-- done
--done
--
--test "x$jpeg_incdir" = xNO && jpeg_incdir=
--
--if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBJPEG 1
--_ACEOF
--
--else
-- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-- { echo "$as_me:$LINENO: WARNING:
--There is an installation error in jpeg support. You seem to have only one
--of either the headers _or_ the libraries installed. You may need to either
--provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
--Disabling JPEG support.
--" >&5
--echo "$as_me: WARNING:
--There is an installation error in jpeg support. You seem to have only one
--of either the headers _or_ the libraries installed. You may need to either
--provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
--Disabling JPEG support.
--" >&2;}
-- else
-- { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
--echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-- fi
-- jpeg_incdir=
-- LIBJPEG=
--fi
--
--
--
--
--
--
--
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ LIBJPEG=
+
+@@ -29557,7 +32553,7 @@
+ do
+ for j in jpeglib.h;
+ do
+- echo "configure: 29560: $i/$j" >&5
++ echo "configure: 32556: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ jpeg_incdir=$i
+@@ -29604,14 +32600,14 @@
+
+
+
- echo "$as_me:$LINENO: checking for perl" >&5
-echo $ECHO_N "checking for perl... $ECHO_C" >&6
-- if test -n "$PERL"; then
-- kde_cv_path="$PERL";
-- else
-- kde_cache=`echo perl | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+ if test -n "$PERL"; then
+ kde_cv_path="$PERL";
+ else
+ kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$bindir $exec_prefix/bin $prefix/bin $dirs"
-- else dirs="$dirs $bindir $exec_prefix/bin $prefix/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/perl"; then
-- if test -n ""
-- then
-- evalstr="$dir/perl 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/perl"
-- break
-- fi
-- else
-- kde_cv_path="$dir/perl"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -29654,8 +32650,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
--We need perl to generate some code." >&5
--echo "$as_me: error: No Perl found in your $PATH.
--We need perl to generate some code." >&2;}
-- { (exit 1); exit 1; }; }
-+ 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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29664,8 +32660,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- PERL=$kde_cv_path
-+kde_cv_try_link_python_m=no
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PERL=$kde_cv_path
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ fi
+@@ -29679,10 +32675,9 @@
-+fi
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-# Check whether --enable-mt or --disable-mt was given.
--if test "${enable_mt+set}" = set; then
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
- enableval="$enable_mt"
- kde_use_qt_mt=$enableval
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ enableval=$enable_mt; kde_use_qt_mt=$enableval
else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-- if test $kde_qtver = 3; then
-- kde_use_qt_mt=yes
-- else
-- kde_use_qt_mt=no
-- fi
--
--
--fi;
--
--USING_QT_MT=""
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test $kde_qtver = 3; then
+@@ -29692,7 +32687,8 @@
+ fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
--KDE_MT_LDFLAGS=
--KDE_MT_LIBS=
--if test "x$kde_use_qt_mt" = "xyes"; then
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+-fi;
++fi
++
-+#include <Python.h>
+ USING_QT_MT=""
-+int
-+main ()
-+{
-
-- if test -z "$LIBPTHREAD"; then
-- if test -z "$USE_THREADS"; then
-- kde_check_threading_default=no
-- else
-- kde_check_threading_default=yes
-- fi
-- else
-- kde_check_threading_default=yes
-- fi
+@@ -29712,13 +32708,13 @@
+ else
+ kde_check_threading_default=yes
+ fi
- # Check whether --enable-threading or --disable-threading was given.
--if test "${enable_threading+set}" = set; then
++ # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
- enableval="$enable_threading"
- kde_use_threading=$enableval
--else
-- kde_use_threading=$kde_check_threading_default
++ enableval=$enable_threading; kde_use_threading=$enableval
+ else
+ kde_use_threading=$kde_check_threading_default
-fi;
-- if test "x$kde_use_threading" = "xyes"; then
-+ PySys_SetArgv(1, 0);
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBPTHREAD 1
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- fi
-+kde_cv_try_link_python_pthread=no
-
-- if test "x$kde_use_threading" = "xyes"; then
-- CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-- KDE_MT_LDFLAGS="$USE_THREADS"
-- KDE_MT_LIBS="$LIBPTHREAD"
-- else
-- kde_use_qt_mt=no
-- fi
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
+fi
++
+ if test "x$kde_use_threading" = "xyes"; then
-
--kde_qt_was_given=yes
--
--if test -z "$LIBQT_GLOB"; then
-- if test "x$kde_use_qt_emb" = "xyes"; then
-- LIBQT_GLOB="libqte.*"
-- else
-- LIBQT_GLOB="libqt.*"
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
- fi
--fi
-
--if test "x$kde_use_qt_emb" = "xyes"; then
-- qtlib="qte"
- else
-- qtlib="qt"
--fi
--
--kde_int_qt="-l$qtlib"
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--if test -z "$LIBQPE"; then
-- if test "x$kde_use_qt_emb" = "xyes"; then
-- if test "x$kde_use_qt_emb_palm" = "xyes"; then
-- LIB_QPE="-lqpe"
-- else
-- LIB_QPE=""
-- fi
-- else
-- LIB_QPE=""
-- fi
+ cat >>confdefs.h <<\_ACEOF
+@@ -29790,8 +32786,8 @@
+ LIBQT="$LIBQT $LIBDL"
fi
--
--if test "x$kde_use_qt_mt" = "xyes"; then
-- LIBQT="-l$qtlib-mt"
-- kde_int_qt="-l$qtlib-mt"
-- LIBQT_GLOB="lib$qtlib-mt.*"
-- USING_QT_MT="using -mt"
--else
-- LIBQT="-l$qtlib"
- fi
-
--if test $kde_qtver != 1; then
--
-
-
-- LIBQT="$LIBQT $LIBPNG $LIBJPEG"
--fi
--
--if test $kde_qtver = 3; then
-+if test "$kde_python_link_found" = no; then
-
-- LIBQT="$LIBQT $LIBDL"
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
- fi
-
-echo "$as_me:$LINENO: checking for Qt" >&5
-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
--fi
--ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
--qt_libraries=""
--qt_includes=""
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 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"
+@@ -29800,34 +32796,34 @@
+ qt_libraries=""
+ qt_includes=""
-# Check whether --with-qt-dir or --without-qt-dir was given.
--if test "${with_qt_dir+set}" = set; then
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
- withval="$with_qt_dir"
- ac_qt_includes="$withval"/include
-- ac_qt_libraries="$withval"/lib${kdelibsuff}
-- ac_qt_bindir="$withval"/bin
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
++ withval=$with_qt_dir; ac_qt_includes="$withval"/include
+ ac_qt_libraries="$withval"/lib${kdelibsuff}
+ ac_qt_bindir="$withval"/bin
-fi;
-+#include <Python.h>
++fi
++
-+int
-+main ()
-+{
-# Check whether --with-qt-includes or --without-qt-includes was given.
--if test "${with_qt_includes+set}" = set; then
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
- withval="$with_qt_includes"
-+ PySys_SetArgv(1, 0);
+-
++ withval=$with_qt_includes;
+ ac_qt_includes="$withval"
-- ac_qt_includes="$withval"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-fi;
-+kde_cv_try_link_python_tcl=no
-
--kde_qt_libs_given=no
+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++
-+fi
+ kde_qt_libs_given=no
+
-# Check whether --with-qt-libraries or --without-qt-libraries was given.
--if test "${with_qt_libraries+set}" = set; then
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
- withval="$with_qt_libraries"
- ac_qt_libraries="$withval"
-- kde_qt_libs_given=yes
++ withval=$with_qt_libraries; ac_qt_libraries="$withval"
+ kde_qt_libs_given=yes
-fi;
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
++fi
++
--if test "${ac_cv_have_qt+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- #try to guess Qt locations
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ if test "${ac_cv_have_qt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -29855,7 +32851,7 @@
+ do
+ for j in $kde_qt_header;
+ do
+- echo "configure: 29858: $i/$j" >&5
++ echo "configure: 32854: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ qt_incdir=$i
+@@ -29892,8 +32888,7 @@
+ ac_qt_libraries="$qt_libdir"
--qt_incdirs=""
--for dir in $kde_qt_dirs; do
-- qt_incdirs="$qt_incdirs $dir/include $dir"
--done
--qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
--if test ! "$ac_qt_includes" = "NO"; then
-- qt_incdirs="$ac_qt_includes $qt_incdirs"
- fi
--if test "$kde_qtver" != "1"; then
-- kde_qt_header=qstyle.h
--else
-- kde_qt_header=qglobal.h
- fi
-
-
--qt_incdir=NO
--for i in $qt_incdirs;
--do
-- for j in $kde_qt_header;
-- do
-- echo "configure: 29860: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- qt_incdir=$i
-- break 2
-- fi
-- done
--done
-
--ac_qt_includes="$qt_incdir"
-+if test "$kde_python_link_found" = no; then
-
--qt_libdirs=""
--for dir in $kde_qt_dirs; do
-- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
--done
--qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
--if test ! "$ac_qt_libraries" = "NO"; then
-- qt_libdir=$ac_qt_libraries
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- qt_libdirs="$ac_qt_libraries $qt_libdirs"
-- # if the Qt was given, the chance is too big that libqt.* doesn't exist
-- qt_libdir=NONE
-- for dir in $qt_libdirs; do
-- try="ls -1 $dir/${LIBQT_GLOB}"
-- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-- done
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
- fi
--for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-- if test -e "$a"; then
-- LIBQT="$LIBQT ${kde_int_qt}_incremental"
-- break
-- fi
--done
-
--ac_qt_libraries="$qt_libdir"
--
--
--
- 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'
--
--
--
--ac_cxxflags_safe="$CXXFLAGS"
--ac_ldflags_safe="$LDFLAGS"
--ac_libs_safe="$LIBS"
--
--CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
--LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
--LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
++ 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'
+@@ -30030,13 +33025,13 @@
+ eval "$ac_cv_have_qt"
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--cat > conftest.$ac_ext <<EOF
--#include "confdefs.h"
--#include <qglobal.h>
--#include <qapplication.h>
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qevent.h>
--#include <qstring.h>
--#include <qstyle.h>
--EOF
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
--#if QT_VERSION < 210
--#error 1
--#endif
--EOF
--fi
--fi
-+#include <Python.h>
-
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qcursor.h>
--#include <qstylefactory.h>
--#include <private/qucomextra_p.h>
--EOF
--fi
-+int
-+main ()
-+{
-
--echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
--cat >> conftest.$ac_ext <<EOF
--#error 1
--#endif
-+ PySys_SetArgv(1, 0);
-
--int main() {
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
-- QStringList *t = new QStringList();
-- Q_UNUSED(t);
--EOF
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
-- QString s;
-- s.setLatin1("Elvis is alive", 14);
--EOF
--fi
--fi
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
-- (void)QStyleFactory::create(QString::null);
-- QCursor c(Qt::WhatsThisCursor);
--EOF
--fi
--cat >> conftest.$ac_ext <<EOF
-- return 0;
-+ ;
-+ return 0;
- }
--EOF
--
--
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&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_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest; then
-- rm -f conftest*
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_qt_libraries="NO"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
- fi
--rm -f conftest*
--CXXFLAGS="$ac_cxxflags_safe"
--LDFLAGS="$ac_ldflags_safe"
--LIBS="$ac_libs_safe"
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+fi
-
--if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-- ac_cv_have_qt="have_qt=no"
-- ac_qt_notfound=""
-- missing_qt_mt=""
-- if test "$ac_qt_includes" = NO; then
-- if test "$ac_qt_libraries" = NO; then
-- ac_qt_notfound="(headers and libraries)";
-- else
-- ac_qt_notfound="(headers)";
-- fi
-- else
-- if test "x$kde_use_qt_mt" = "xyes"; then
-- missing_qt_mt="
--Make sure that you have compiled Qt with thread support!"
-- ac_qt_notfound="(library $qtlib-mt)";
-- else
-- ac_qt_notfound="(library $qtlib)";
-- fi
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
- fi
-
-- { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
--For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
--echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
--For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
-- { (exit 1); exit 1; }; }
- else
-- have_qt="yes"
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
- fi
-
-
--eval "$ac_cv_have_qt"
-
--if test "$have_qt" != yes; then
+ if test "$have_qt" != yes; then
- echo "$as_me:$LINENO: result: $have_qt" >&5
-echo "${ECHO_T}$have_qt" >&6;
--else
-- ac_cv_have_qt="have_qt=yes \
-- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
++ { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+ ac_cv_have_qt="have_qt=yes \
+ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
- echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
-- qt_libraries="$ac_qt_libraries"
-- qt_includes="$ac_qt_includes"
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
- fi
+ qt_libraries="$ac_qt_libraries"
+ qt_includes="$ac_qt_includes"
+@@ -30045,15 +33040,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
--if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
--
--
+
-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
--if test "${kde_cv_qt_direct+set}" = set; then
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
+-
- 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'
-+#include <Python.h>
++ 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'
+@@ -30174,12 +33168,12 @@
-+int
-+main ()
-+{
--ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
--ac_LIBRARY_PATH="$LIBRARY_PATH"
--ac_cxxflags_safe="$CXXFLAGS"
--ac_ldflags_safe="$LDFLAGS"
--ac_libs_safe="$LIBS"
-+ PySys_SetArgv(1, 0);
-
--CXXFLAGS="$CXXFLAGS -I$qt_includes"
--LDFLAGS="$LDFLAGS $X_LDFLAGS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
+ if test "$kde_cv_qt_direct" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ qt_libraries=
else
--LIBS="$LIBQT $LIBSOCKET"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread=no
-+
- fi
--LD_LIBRARY_PATH=
--export LD_LIBRARY_PATH
--LIBRARY_PATH=
--export LIBRARY_PATH
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
-+fi
-
-
--cat > conftest.$ac_ext <<EOF
--#include "confdefs.h"
--#include <qglobal.h>
--#include <qapplication.h>
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qevent.h>
--#include <qstring.h>
--#include <qstyle.h>
--EOF
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
--#if QT_VERSION < 210
--#error 1
--#endif
--EOF
--fi
fi
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qcursor.h>
--#include <qstylefactory.h>
--#include <private/qucomextra_p.h>
--EOF
- fi
+@@ -30217,14 +33211,14 @@
+ fi
--echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
--cat >> conftest.$ac_ext <<EOF
--#error 1
--#endif
--int main() {
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
-- QStringList *t = new QStringList();
-- Q_UNUSED(t);
--EOF
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
-- QString s;
-- s.setLatin1("Elvis is alive", 14);
--EOF
--fi
--fi
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
-- (void)QStyleFactory::create(QString::null);
-- QCursor c(Qt::WhatsThisCursor);
--EOF
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
- fi
--cat >> conftest.$ac_ext <<EOF
-- return 0;
--}
--EOF
-
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&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); } && test -s conftest; then
-- kde_cv_qt_direct="yes"
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
-- kde_cv_qt_direct="no"
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
--fi
--
--rm -f conftest*
--CXXFLAGS="$ac_cxxflags_safe"
--LDFLAGS="$ac_ldflags_safe"
--LIBS="$ac_libs_safe"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
--export LD_LIBRARY_PATH
--LIBRARY_PATH="$ac_LIBRARY_PATH"
--export LIBRARY_PATH
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+kde_cv_try_link_python_m_and_thread_and_util=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
--if test "$kde_cv_qt_direct" = "yes"; then
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- qt_libraries=
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -30189,338 +52945,330 @@
-
-
-
-+if test "$kde_python_link_found" = no; then
-
--if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-- QT_INCLUDES=""
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- QT_INCLUDES="-I$qt_includes"
-- all_includes="$QT_INCLUDES $all_includes"
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
- fi
-
--if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-- QT_LDFLAGS=""
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- QT_LDFLAGS="-L$qt_libraries"
-- all_libraries="$QT_LDFLAGS $all_libraries"
--fi
--test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
-- qt_bindirs=""
-- for dir in $kde_qt_dirs; do
-- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-- done
-- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-- if test ! "$ac_qt_bindir" = "NO"; then
-- qt_bindirs="$ac_qt_bindir $qt_bindirs"
-- fi
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "$as_me:$LINENO: checking for moc" >&5
-echo $ECHO_N "checking for moc... $ECHO_C" >&6
-- if test -n "$MOC"; then
-- kde_cv_path="$MOC";
-- else
-- kde_cache=`echo moc | sed 'y%./+-%__p_%'`
-+kde_cv_try_link_python_m_and_thread_and_db3=no
++ { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+ if test -n "$MOC"; then
+ kde_cv_path="$MOC";
+ else
+ kde_cache=`echo moc | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$qt_bindirs $dirs"
-- else dirs="$dirs $qt_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+fi
+@@ -30267,8 +33261,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/moc"; then
-- if test -n ""
-- then
-- evalstr="$dir/moc 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/moc"
-- break
-- fi
-- else
-- kde_cv_path="$dir/moc"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi
-
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
--Please check whether you installed Qt correctly.
--You need to have a running moc binary.
--configure tried to run $ac_cv_path_moc and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable MOC to the right one before running
--configure.
--" >&5
--echo "$as_me: error: No Qt meta object compiler (moc) found!
--Please check whether you installed Qt correctly.
--You need to have a running moc binary.
--configure tried to run $ac_cv_path_moc and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable MOC to the right one before running
--configure.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
+ { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30289,22 +33283,22 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MOC=$kde_cv_path
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MOC=$kde_cv_path
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ fi
-- if test -z "$UIC_NOT_NEEDED"; then
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ if test -z "$UIC_NOT_NEEDED"; then
- echo "$as_me:$LINENO: checking for uic" >&5
-echo $ECHO_N "checking for uic... $ECHO_C" >&6
-- if test -n "$UIC_PATH"; then
-- kde_cv_path="$UIC_PATH";
-- else
-- kde_cache=`echo uic | sed 'y%./+-%__p_%'`
-+#include <Python.h>
++ { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+ if test -n "$UIC_PATH"; then
+ kde_cv_path="$UIC_PATH";
+ else
+ kde_cache=`echo uic | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+int
-+main ()
-+{
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$qt_bindirs $dirs"
-- else dirs="$dirs $qt_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+ PySys_SetArgv(1, 0);
+@@ -30347,12 +33341,12 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/uic"; then
-- if test -n ""
-- then
-- evalstr="$dir/uic 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/uic"
-- break
-- fi
-- else
-- kde_cv_path="$dir/uic"
-- break
-- fi
-- fi
-- done
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+kde_cv_try_link_python_pthread_and_db3=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- UIC_PATH=""
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ UIC_PATH=""
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- UIC_PATH=$kde_cv_path
-+fi
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ UIC_PATH=$kde_cv_path
-- fi
-+fi
+ fi
+@@ -30382,10 +33376,10 @@
-- if test -z "$UIC_PATH" ; then
+ if test $kde_qtver = 3; then
-- { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
--Please check whether you installed Qt correctly.
--You need to have a running uic binary.
--configure tried to run $ac_cv_path_uic and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable UIC to the right one before running
--configure.
--" >&5
--echo "$as_me: WARNING: No Qt ui compiler (uic) found!
--Please check whether you installed Qt correctly.
--You need to have a running uic binary.
--configure tried to run $ac_cv_path_uic and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable UIC to the right one before running
--configure.
--" >&2;}
-
-- exit 1
-- else
-- UIC=$UIC_PATH
-+if test "$kde_python_link_found" = no; then
-
-- if test $kde_qtver = 3; then
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-
- echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
-- kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
++ { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+ kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.ui <<EOT
-- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
--EOT
-- ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null"
-- if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-- (eval $ac_uic_testrun) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- eval "kde_cv_prog_uic_$kde_cache=yes"
-- else
-- eval "kde_cv_prog_uic_$kde_cache=no"
-- fi
-- rm -f conftest*
--
--fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -30408,22 +33402,22 @@
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- :
-- ac_uic_supports_libpath=yes
-- else
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ ac_uic_supports_libpath=yes
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- :
-- ac_uic_supports_libpath=no
-- fi
-+#include <Python.h>
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ ac_uic_supports_libpath=no
+ fi
-+int
-+main ()
-+{
- echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
-- kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
++ { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+ kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+ PySys_SetArgv(1, 0);
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- cat >conftest.ui <<EOT
-- <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
--EOT
-- ac_uic_testrun="$UIC_PATH -nounload conftest.ui >/dev/null"
-- if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-- (eval $ac_uic_testrun) 2>&5
-+ ;
-+ 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
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- eval "kde_cv_prog_uic_$kde_cache=yes"
-- else
-- eval "kde_cv_prog_uic_$kde_cache=no"
-- fi
-- rm -f conftest*
--
--fi
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30446,13 +33440,13 @@
-+kde_cv_try_link_python_m_and_thread_and_db=no
-- if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- :
-- ac_uic_supports_nounload=yes
-- else
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ ac_uic_supports_nounload=yes
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- :
-- ac_uic_supports_nounload=no
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ :
+ ac_uic_supports_nounload=no
+ fi
+@@ -30483,15 +33477,14 @@
-+fi
-- if test x$ac_uic_supports_libpath = xyes; then
-- UIC="$UIC -L \$(kde_widgetdir)"
-- fi
-- if test x$ac_uic_supports_nounload = xyes; then
-- UIC="$UIC -nounload"
-- fi
-- fi
-- fi
-- else
-- UIC="echo uic not available: "
-- fi
-
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-- UIC_TR="i18n"
-- if test $kde_qtver = 3; then
-- UIC_TR="tr2i18n"
-- fi
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-
--if test -n "$LIBJPEG"; then
+ if test -n "$LIBJPEG"; then
-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
--if test "${kde_cv_qt_jpeg+set}" = set; then
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- 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'
--
--
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
--LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
++ 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'
+@@ -30524,23 +33517,36 @@
+ }
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <qapplication.h>
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-- int argc;
-- char** argv;
-- QApplication app(argc, argv);
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -30534,7 +53282,7 @@
+ 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'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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=$?
-@@ -30546,1917 +53294,2337 @@
+ 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
-- eval "kde_cv_qt_jpeg=no"
-+ kde_cv_try_link_python_pthread_and_dl=yes
- else
+@@ -30549,8 +33555,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "kde_cv_qt_jpeg=yes"
-+kde_cv_try_link_python_pthread_and_dl=no
++ eval "kde_cv_qt_jpeg=yes"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS="$ac_save_LIBS"
--CXXFLAGS="$ac_save_CXXFLAGS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--fi
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS="$ac_save_LIBS"
+@@ -30567,12 +33574,12 @@
- fi
-
--if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- LIBJPEG_QT='$(LIBJPEG)'
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ LIBJPEG_QT='$(LIBJPEG)'
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- LIBJPEG_QT=
-+
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBJPEG_QT=
fi
-+fi
+@@ -30603,15 +33610,15 @@
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
--LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
- fi
--test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
--for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-- if test -e "$a"; then
-- LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-- break
-- fi
--done
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-
-echo "$as_me:$LINENO: checking for rpath" >&5
-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
-# Check whether --enable-rpath or --disable-rpath was given.
--if test "${enable_rpath+set}" = set; then
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
- enableval="$enable_rpath"
- USE_RPATH=$enableval
++ enableval=$enable_rpath; USE_RPATH=$enableval
else
-- USE_RPATH=yes
+ USE_RPATH=yes
-fi;
--
--if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
--
-- KDE_RPATH="-R \$(libdir)"
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- if test "$kde_libraries" != "$libdir"; then
-- KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
-- fi
+fi
++
-- if test -n "$qt_libraries"; then
-- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-- fi
-- if test -n "$X_LDFLAGS"; then
-- X_RPATH="-R \$(x_libraries)"
-- KDE_RPATH="$KDE_RPATH $X_RPATH"
-- fi
-- if test -n "$KDE_EXTRA_RPATH"; then
-- KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-- fi
- fi
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+@@ -30635,11 +33642,11 @@
+
-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-echo "${ECHO_T}$USE_RPATH" >&6
-+if test "$kde_python_link_found" = no; then
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
-echo "$as_me:$LINENO: checking for KDE" >&5
-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
--if test "${prefix}" != NONE; then
-- kde_includes=${includedir}
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--savex=$exec_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--tmp=$includedir
--while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done
--exec_prefix=$savex
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- kde_libraries=${libdir}
-+#include <Python.h>
-
--savex=$exec_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--tmp=$libdir
--while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done
--exec_prefix=$savex
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
-- ac_kde_includes=
-- ac_kde_libraries=
-- kde_libraries=""
-- kde_includes=""
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if test "${ac_cv_have_kde+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- #try to guess kde locations
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--if test "$kde_qtver" = 1; then
-- kde_check_header="ksock.h"
-- kde_check_lib="libkdecore.la"
--else
-- kde_check_header="ksharedptr.h"
-- kde_check_lib="libkio.la"
- fi
-
--if test -z ""; then
-
--kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
--test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
--kde_incdirs="$ac_kde_includes $kde_incdirs"
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-
--kde_incdir=NO
--for i in $kde_incdirs;
--do
-- for j in $kde_check_header;
-- do
-- echo "configure: 30696: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- kde_incdir=$i
-- break 2
-- fi
-- done
--done
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-
--ac_kde_includes="$kde_incdir"
-+fi
-
--if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-- { { echo "$as_me:$LINENO: error:
--in the prefix, you've chosen, are no KDE headers installed. This will fail.
--So, check this please and use another prefix!" >&5
--echo "$as_me: error:
--in the prefix, you've chosen, are no KDE headers installed. This will fail.
--So, check this please and use another prefix!" >&2;}
-- { (exit 1); exit 1; }; }
- fi
-
--kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
--test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
--kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-
--kde_libdir=NO
--for i in $kde_libdirs;
--do
-- for j in $kde_check_lib;
-- do
-- echo "configure: 30726: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- kde_libdir=$i
-- break 2
-- fi
-- done
--done
-
--ac_kde_libraries="$kde_libdir"
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-
--kde_widgetdir=NO
-
--kde_widgetdir=NO
--for i in $kde_libdirs;
--do
-- for j in "kde3/plugins/designer/kdewidgets.la";
-- do
-- echo "configure: 30744: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- kde_widgetdir=$i
-- break 2
-- fi
-- done
--done
-
-
--if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
--{ { echo "$as_me:$LINENO: error:
--in the prefix, you've chosen, are no KDE libraries installed. This will fail.
--So, check this please and use another prefix!" >&5
--echo "$as_me: error:
--in the prefix, you've chosen, are no KDE libraries installed. This will fail.
--So, check this please and use another prefix!" >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
--if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
--{ { echo "$as_me:$LINENO: error:
--I can't find the designer plugins. These are required and should have been installed
--by kdelibs" >&5
--echo "$as_me: error:
--I can't find the designer plugins. These are required and should have been installed
--by kdelibs" >&2;}
-- { (exit 1); exit 1; }; }
--fi
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-
--if test -n "$kde_widgetdir"; then
-- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
- fi
-
-
--if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-- ac_cv_have_kde="have_kde=no"
--else
-- ac_cv_have_kde="have_kde=yes \
-- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
--fi
--
- else
-- ac_cv_have_kde="have_kde=no"
-+ kde_python_link_found=no
-
--fi
-+if test "$kde_python_link_found" = no; then
-
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
- fi
-
--eval "$ac_cv_have_kde"
--
--if test "$have_kde" != "yes"; then
-- if test "${prefix}" = NONE; then
-- ac_kde_prefix="$ac_default_prefix"
-- else
-- ac_kde_prefix="$prefix"
-- fi
-- if test "$exec_prefix" = NONE; then
-- ac_kde_exec_prefix="$ac_kde_prefix"
+ if test "${prefix}" != NONE; then
+ kde_includes=${includedir}
+@@ -30691,7 +33698,7 @@
+ do
+ for j in $kde_check_header;
+ do
+- echo "configure: 30694: $i/$j" >&5
++ echo "configure: 33701: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ kde_incdir=$i
+@@ -30721,7 +33728,7 @@
+ do
+ for j in $kde_check_lib;
+ do
+- echo "configure: 30724: $i/$j" >&5
++ echo "configure: 33731: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ kde_libdir=$i
+@@ -30739,7 +33746,7 @@
+ do
+ for j in "kde3/plugins/designer/kdewidgets.la";
+ do
+- echo "configure: 30742: $i/$j" >&5
++ echo "configure: 33749: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ kde_widgetdir=$i
+@@ -30798,12 +33805,12 @@
+ fi
+ if test "$exec_prefix" = NONE; then
+ ac_kde_exec_prefix="$ac_kde_prefix"
- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
-- else
-- ac_kde_exec_prefix="$exec_prefix"
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+ else
+ ac_kde_exec_prefix="$exec_prefix"
- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
-- fi
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+ fi
-- kde_libraries="${libdir}"
-- kde_includes="${includedir}"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--else
-- ac_cv_have_kde="have_kde=yes \
-- ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+ kde_libraries="${libdir}"
+@@ -30812,8 +33819,8 @@
+ else
+ ac_cv_have_kde="have_kde=yes \
+ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
- echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
++ { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
-- kde_libraries="$ac_kde_libraries"
-- kde_includes="$ac_kde_includes"
--fi
-+#include <Python.h>
+ kde_libraries="$ac_kde_libraries"
+ kde_includes="$ac_kde_includes"
+@@ -30851,8 +33858,8 @@
-+int
-+main ()
-+{
+ if test x$ac_uic_supports_libpath = xyes; then
-+ PySys_SetArgv(1, 0);
-
--if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then
-- KDE_INCLUDES=""
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
- else
-- KDE_INCLUDES="-I$kde_includes"
-- all_includes="$KDE_INCLUDES $all_includes"
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-+kde_cv_try_link_python_normal=no
-
--KDE_LDFLAGS="-L$kde_libraries"
--if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
-- all_libraries="$KDE_LDFLAGS $all_libraries"
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
--all_libraries="$all_libraries $USER_LDFLAGS"
--all_includes="$all_includes $USER_INCLUDES"
--
--
-+fi
-
--if test -z ""; then
-
-
-+if test "$kde_python_link_found" = no; then
-
--if test x$ac_uic_supports_libpath = xyes; then
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-
-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
--if test "${kde_cv_uic_plugins+set}" = set; then
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
--cat > actest.ui << EOF
--<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
--<class>NewConnectionDialog</class>
--<widget class="QDialog">
-- <widget class="KLineEdit">
-- <property name="name">
-- <cstring>testInput</cstring>
-- </property>
-- </widget>
--</widget>
--</UI>
--EOF
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
--kde_cv_uic_plugins=no
--kde_line="$UIC_PATH -L $kde_widgetdir"
--if test x$ac_uic_supports_nounload = xyes; then
-- kde_line="$kde_line -nounload"
--fi
--kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
--if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
-- (eval $kde_line) 2>&5
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # if you're trying to debug this check and think it's incorrect,
-- # better check your installation. The check _is_ correct - your
-- # installation is not.
-- if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-- kde_cv_uic_plugins=yes
-- fi
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
+@@ -30895,8 +33902,8 @@
fi
--rm -f actest.ui actest.cpp
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
- fi
-
-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
--if test "$kde_cv_uic_plugins" != yes; then
-- { { echo "$as_me:$LINENO: error:
--you need to install kdelibs first.
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ { { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -30928,10 +33935,9 @@
--If you did install kdelibs, then the Qt version that is picked up by
--this configure is not the same version you used to compile kdelibs.
--The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
--_same Qt version_, compiled with the _same compiler_ and the same Qt
--configuration settings.
--" >&5
--echo "$as_me: error:
--you need to install kdelibs first.
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
--If you did install kdelibs, then the Qt version that is picked up by
--this configure is not the same version you used to compile kdelibs.
--The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
--_same Qt version_, compiled with the _same compiler_ and the same Qt
--configuration settings.
--" >&2;}
-- { (exit 1); exit 1; }; }
--fi
- fi
- fi
-
--ac_kde_libraries="$kde_libdir"
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
- # Check whether --enable-path-check or --disable-path-check was given.
--if test "${enable_path_check+set}" = set; then
++ # Check whether --enable-path-check was given.
+ if test "${enable_path_check+set}" = set; then
- enableval="$enable_path_check"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+-
++ enableval=$enable_path_check;
+ if test "$enableval" = "no";
+ then ac_use_path_checking="default"
+ else ac_use_path_checking=""
+@@ -30945,13 +33951,14 @@
+ fi
-- if test "$enableval" = "no";
-- then ac_use_path_checking="default"
-- else ac_use_path_checking=""
-- fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
--else
-+#include <Python.h>
-
-- if test "$kde_qtver" = 1;
-- then ac_use_path_checking=""
-- else ac_use_path_checking="default"
-- fi
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-fi;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++fi
++
-+kde_cv_try_link_python_pthread=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+fi
-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
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-
--if test "$ac_use_path_checking" = "default"; then
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- if test -z "$kde_htmldir"; then
-- kde_htmldir='\${datadir}/doc/HTML'
-- fi
-- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-- fi
-- if test -z "$kde_icondir"; then
-- kde_icondir='\${datadir}/icons'
-- fi
-- if test -z "$kde_sounddir"; then
-- kde_sounddir='\${datadir}/sounds'
-- fi
-- if test -z "$kde_datadir"; then
-- kde_datadir='\${datadir}/apps'
-- fi
-- if test -z "$kde_locale"; then
-- kde_locale='\${datadir}/locale'
-- fi
-- if test -z "$kde_cgidir"; then
-- kde_cgidir='\${exec_prefix}/cgi-bin'
-- fi
-- if test -z "$kde_confdir"; then
-- kde_confdir='\${datadir}/config'
-- fi
-- if test -z "$kde_kcfgdir"; then
-- kde_kcfgdir='\${datadir}/config.kcfg'
-- fi
-- if test -z "$kde_mimedir"; then
-- kde_mimedir='\${datadir}/mimelnk'
-- fi
-- if test -z "$kde_toolbardir"; then
-- kde_toolbardir='\${datadir}/toolbar'
-- fi
-- if test -z "$kde_wallpaperdir"; then
-- kde_wallpaperdir='\${datadir}/wallpapers'
-- fi
-- if test -z "$kde_templatesdir"; then
-- kde_templatesdir='\${datadir}/templates'
-- fi
-- if test -z "$kde_bindir"; then
-- kde_bindir='\${exec_prefix}/bin'
-- fi
-- if test -z "$kde_servicesdir"; then
-- kde_servicesdir='\${datadir}/services'
-- fi
-- if test -z "$kde_servicetypesdir"; then
-- kde_servicetypesdir='\${datadir}/servicetypes'
-- fi
-- if test -z "$kde_moduledir"; then
-- if test "$kde_qtver" = "2"; then
-- kde_moduledir='\${libdir}/kde2'
-- else
-- kde_moduledir='\${libdir}/kde3'
-- fi
-- fi
-- if test -z "$kde_styledir"; then
-- kde_styledir='\${libdir}/kde3/plugins/styles'
-- fi
-- if test -z "$kde_widgetdir"; then
-- kde_widgetdir='\${libdir}/kde3/plugins/designer'
-- fi
-- if test -z "$xdg_appsdir"; then
-- xdg_appsdir='\${datadir}/applications/kde'
-- fi
-- if test -z "$xdg_menudir"; then
-- xdg_menudir='\${sysconfdir}/xdg/menus'
-- fi
-- if test -z "$xdg_directorydir"; then
-- xdg_directorydir='\${datadir}/desktop-directories'
-- fi
-+fi
-+
-+fi
-
-
-- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-- kde_htmldir=\"$kde_htmldir\" \
-- kde_appsdir=\"$kde_appsdir\" \
-- kde_icondir=\"$kde_icondir\" \
-- kde_sounddir=\"$kde_sounddir\" \
-- kde_datadir=\"$kde_datadir\" \
-- kde_locale=\"$kde_locale\" \
-- kde_cgidir=\"$kde_cgidir\" \
-- kde_confdir=\"$kde_confdir\" \
-- kde_kcfgdir=\"$kde_kcfgdir\" \
-- kde_mimedir=\"$kde_mimedir\" \
-- kde_toolbardir=\"$kde_toolbardir\" \
-- kde_wallpaperdir=\"$kde_wallpaperdir\" \
-- kde_templatesdir=\"$kde_templatesdir\" \
-- kde_bindir=\"$kde_bindir\" \
-- kde_servicesdir=\"$kde_servicesdir\" \
-- kde_servicetypesdir=\"$kde_servicetypesdir\" \
-- kde_moduledir=\"$kde_moduledir\" \
-- kde_styledir=\"$kde_styledir\" \
-- kde_widgetdir=\"$kde_widgetdir\" \
-- xdg_appsdir=\"$xdg_appsdir\" \
-- xdg_menudir=\"$xdg_menudir\" \
-- xdg_directorydir=\"$xdg_directorydir\" \
-- kde_result=defaults"
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $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
+@@ -31062,15 +34069,14 @@
else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-- if test $kde_qtver = 1; then
+ if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+-
++ { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <Python.h>
++ { 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_cpp='$CXXCPP $CPPFLAGS'
--ac_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
-+int
-+main ()
-+{
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_tcl=no
-
--cat > conftest.$ac_ext <<EOF
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--#include <stdio.h>
--#include "confdefs.h"
--#include <kapp.h>
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--int main() {
-- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-- printf("kde_wallpaperdir=\\"%s\\"\n",
-- KApplication::kde_wallpaperdir().data());
-- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-- printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-- printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-- printf("kde_styledir=\\"/tmp/dummy\\"\n");
-- printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-- printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-- printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-- printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-- return 0;
-- }
--EOF
-+fi
-
-- ac_save_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS="$all_includes $CPPFLAGS"
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ 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'
+@@ -31122,8 +34128,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
- echo "$as_me:$LINENO: result: yes" >&5
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- else
-- { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
--Check, if you installed the KDE header files correctly.
--For more details about this problem, look at the end of config.log." >&5
--echo "$as_me: error: your system is not able to compile a small KDE application!
--Check, if you installed the KDE header files correctly.
--For more details about this problem, look at the end of config.log." >&2;}
-- { (exit 1); exit 1; }; }
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31162,8 +34168,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
-- CPPFLAGS=$ac_save_CPPFLAGS
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-- KDE_TEST_RPATH=
-
-- if test -n "$USE_RPATH"; then
-
-- if test -n "$kde_libraries"; then
-- KDE_TEST_RPATH="-R $kde_libraries"
-- fi
-+if test "$kde_python_link_found" = no; then
-
-- if test -n "$qt_libraries"; then
-- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-- fi
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-
-- if test -n "$x_libraries"; then
-- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-- fi
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&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
+@@ -31171,8 +34177,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest; then
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
+ (exit $ac_status); } && test -s conftest; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
else
-- { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
--Check, if your compiler is installed correctly and if you have used the
--same compiler to compile Qt and kdelibs as you did use now.
--For more details about this problem, look at the end of config.log." >&5
--echo "$as_me: error: your system fails at linking a small KDE application!
--Check, if your compiler is installed correctly and if you have used the
--same compiler to compile Qt and kdelibs as you did use now.
--For more details about this problem, look at the end of config.log." >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
--if eval `KDEDIR= ./conftest 2>&5`; then
-- kde_result=done
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
+ { { 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
+@@ -31365,15 +34371,14 @@
else
-- kde_result=problems
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
- fi
--KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
--kde_have_all_paths=yes
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-- kde_htmldir=\"$kde_htmldir\" \
-- kde_appsdir=\"$kde_appsdir\" \
-- kde_icondir=\"$kde_icondir\" \
-- kde_sounddir=\"$kde_sounddir\" \
-- kde_datadir=\"$kde_datadir\" \
-- kde_locale=\"$kde_locale\" \
-- kde_cgidir=\"$kde_cgidir\" \
-- kde_confdir=\"$kde_confdir\" \
-- kde_kcfgdir=\"$kde_kcfgdir\" \
-- kde_mimedir=\"$kde_mimedir\" \
-- kde_toolbardir=\"$kde_toolbardir\" \
-- kde_wallpaperdir=\"$kde_wallpaperdir\" \
-- kde_templatesdir=\"$kde_templatesdir\" \
-- kde_bindir=\"$kde_bindir\" \
-- kde_servicesdir=\"$kde_servicesdir\" \
-- kde_servicetypesdir=\"$kde_servicetypesdir\" \
-- kde_moduledir=\"$kde_moduledir\" \
-- kde_styledir=\"$kde_styledir\" \
-- kde_widgetdir=\"$kde_widgetdir\" \
-- xdg_appsdir=\"$xdg_appsdir\" \
-- xdg_menudir=\"$xdg_menudir\" \
-- xdg_directorydir=\"$xdg_directorydir\" \
-- kde_result=$kde_result"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
-- else
-- { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
--echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-+ PySys_SetArgv(1, 0);
-
--fi
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- kde_cached_paths=no
-+kde_cv_try_link_python_m_and_thread=no
-
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--eval "$kde_cv_all_paths"
-- if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-- test -z "$kde_datadir" || test -z "$kde_locale" ||
-- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
-- test -z "$kde_kcfgdir" ||
-- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-- test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-- test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-- test "x$kde_have_all_paths" != "xyes"; then
-- kde_have_all_paths=no
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
- fi
-
--if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-- # wrong values were cached, may be, we can set better ones
-- kde_result=
-- kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-- kde_datadir= kde_locale= kde_cgidir= kde_confdir= kde_kcfgdir=
-- kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-- kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-- kde_have_all_paths=
-- kde_styledir=
-- kde_widgetdir=
-- xdg_appsdir = xdg_menudir= xdg_directorydir=
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--if test "$ac_use_path_checking" = "default"; then
-+fi
-
-- if test -z "$kde_htmldir"; then
-- kde_htmldir='\${datadir}/doc/HTML'
-- fi
-- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-- fi
-- if test -z "$kde_icondir"; then
-- kde_icondir='\${datadir}/icons'
-- fi
-- if test -z "$kde_sounddir"; then
-- kde_sounddir='\${datadir}/sounds'
-- fi
-- if test -z "$kde_datadir"; then
-- kde_datadir='\${datadir}/apps'
-- fi
-- if test -z "$kde_locale"; then
-- kde_locale='\${datadir}/locale'
-- fi
-- if test -z "$kde_cgidir"; then
-- kde_cgidir='\${exec_prefix}/cgi-bin'
-- fi
-- if test -z "$kde_confdir"; then
-- kde_confdir='\${datadir}/config'
-- fi
-- if test -z "$kde_kcfgdir"; then
-- kde_kcfgdir='\${datadir}/config.kcfg'
-- fi
-- if test -z "$kde_mimedir"; then
-- kde_mimedir='\${datadir}/mimelnk'
-- fi
-- if test -z "$kde_toolbardir"; then
-- kde_toolbardir='\${datadir}/toolbar'
-- fi
-- if test -z "$kde_wallpaperdir"; then
-- kde_wallpaperdir='\${datadir}/wallpapers'
-- fi
-- if test -z "$kde_templatesdir"; then
-- kde_templatesdir='\${datadir}/templates'
-- fi
-- if test -z "$kde_bindir"; then
-- kde_bindir='\${exec_prefix}/bin'
-- fi
-- if test -z "$kde_servicesdir"; then
-- kde_servicesdir='\${datadir}/services'
-- fi
-- if test -z "$kde_servicetypesdir"; then
-- kde_servicetypesdir='\${datadir}/servicetypes'
-- fi
-- if test -z "$kde_moduledir"; then
-- if test "$kde_qtver" = "2"; then
-- kde_moduledir='\${libdir}/kde2'
-- else
-- kde_moduledir='\${libdir}/kde3'
-- fi
-- fi
-- if test -z "$kde_styledir"; then
-- kde_styledir='\${libdir}/kde3/plugins/styles'
-- fi
-- if test -z "$kde_widgetdir"; then
-- kde_widgetdir='\${libdir}/kde3/plugins/designer'
-- fi
-- if test -z "$xdg_appsdir"; then
-- xdg_appsdir='\${datadir}/applications/kde'
-- fi
-- if test -z "$xdg_menudir"; then
-- xdg_menudir='\${sysconfdir}/xdg/menus'
-- fi
-- if test -z "$xdg_directorydir"; then
-- xdg_directorydir='\${datadir}/desktop-directories'
-- fi
-+fi
-
-
-- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-- kde_htmldir=\"$kde_htmldir\" \
-- kde_appsdir=\"$kde_appsdir\" \
-- kde_icondir=\"$kde_icondir\" \
-- kde_sounddir=\"$kde_sounddir\" \
-- kde_datadir=\"$kde_datadir\" \
-- kde_locale=\"$kde_locale\" \
-- kde_cgidir=\"$kde_cgidir\" \
-- kde_confdir=\"$kde_confdir\" \
-- kde_kcfgdir=\"$kde_kcfgdir\" \
-- kde_mimedir=\"$kde_mimedir\" \
-- kde_toolbardir=\"$kde_toolbardir\" \
-- kde_wallpaperdir=\"$kde_wallpaperdir\" \
-- kde_templatesdir=\"$kde_templatesdir\" \
-- kde_bindir=\"$kde_bindir\" \
-- kde_servicesdir=\"$kde_servicesdir\" \
-- kde_servicetypesdir=\"$kde_servicetypesdir\" \
-- kde_moduledir=\"$kde_moduledir\" \
-- kde_styledir=\"$kde_styledir\" \
-- kde_widgetdir=\"$kde_widgetdir\" \
-- xdg_appsdir=\"$xdg_appsdir\" \
-- xdg_menudir=\"$xdg_menudir\" \
-- xdg_directorydir=\"$xdg_directorydir\" \
-- kde_result=defaults"
-
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-
--else
-+int
-+main ()
-+{
-
-- if test $kde_qtver = 1; then
+ if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
-+ PySys_SetArgv(1, 0);
++ { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-+kde_cv_try_link_python_m_and_thread_and_util=no
++ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
+-
- 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
-+fi
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-
--cat > conftest.$ac_ext <<EOF
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--#include <stdio.h>
--#include "confdefs.h"
--#include <kapp.h>
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--int main() {
-- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-- printf("kde_wallpaperdir=\\"%s\\"\n",
-- KApplication::kde_wallpaperdir().data());
-- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-- printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-- printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-- printf("kde_styledir=\\"/tmp/dummy\\"\n");
-- printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-- printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-- printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-- printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-- return 0;
-- }
--EOF
-+fi
-
-- ac_save_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS="$all_includes $CPPFLAGS"
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ 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'
+@@ -31425,8 +34430,8 @@
+ 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
-- 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.
--For more details about this problem, look at the end of config.log." >&5
--echo "$as_me: error: your system is not able to compile a small KDE application!
--Check, if you installed the KDE header files correctly.
--For more details about this problem, look at the end of config.log." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- CPPFLAGS=$ac_save_CPPFLAGS
-+fi
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31465,8 +34470,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-+if test "$kde_python_link_found" = no; then
-
-- KDE_TEST_RPATH=
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-
-- if test -n "$USE_RPATH"; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- if test -n "$kde_libraries"; then
-- KDE_TEST_RPATH="-R $kde_libraries"
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- if test -n "$qt_libraries"; then
-- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-- fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- if test -n "$x_libraries"; then
-- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-- fi
-+#include <Python.h>
-
-- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-- fi
-+int
-+main ()
-+{
-
-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+ PySys_SetArgv(1, 0);
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+ (eval $ac_link) 2>conftest.er1
+@@ -31474,8 +34479,8 @@
ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
+ (exit $ac_status); } && test -s conftest; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
else
-- { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
--Check, if your compiler is installed correctly and if you have used the
--same compiler to compile Qt and kdelibs as you did use now.
--For more details about this problem, look at the end of config.log." >&5
--echo "$as_me: error: your system fails at linking a small KDE application!
--Check, if your compiler is installed correctly and if you have used the
--same compiler to compile Qt and kdelibs as you did use now.
--For more details about this problem, look at the end of config.log." >&2;}
-- { (exit 1); exit 1; }; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
--if eval `KDEDIR= ./conftest 2>&5`; then
-- kde_result=done
--else
-- kde_result=problems
- fi
-
--KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
--kde_have_all_paths=yes
-
-
-- kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-- kde_htmldir=\"$kde_htmldir\" \
-- kde_appsdir=\"$kde_appsdir\" \
-- kde_icondir=\"$kde_icondir\" \
-- kde_sounddir=\"$kde_sounddir\" \
-- kde_datadir=\"$kde_datadir\" \
-- kde_locale=\"$kde_locale\" \
-- kde_cgidir=\"$kde_cgidir\" \
-- kde_confdir=\"$kde_confdir\" \
-- kde_kcfgdir=\"$kde_kcfgdir\" \
-- kde_mimedir=\"$kde_mimedir\" \
-- kde_toolbardir=\"$kde_toolbardir\" \
-- kde_wallpaperdir=\"$kde_wallpaperdir\" \
-- kde_templatesdir=\"$kde_templatesdir\" \
-- kde_bindir=\"$kde_bindir\" \
-- kde_servicesdir=\"$kde_servicesdir\" \
-- kde_servicetypesdir=\"$kde_servicetypesdir\" \
-- kde_moduledir=\"$kde_moduledir\" \
-- kde_styledir=\"$kde_styledir\" \
-- kde_widgetdir=\"$kde_widgetdir\" \
-- xdg_appsdir=\"$xdg_appsdir\" \
-- xdg_menudir=\"$xdg_menudir\" \
-- xdg_directorydir=\"$xdg_directorydir\" \
-- kde_result=$kde_result"
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- else
-- { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
--echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "$kde_cv_all_paths"
-- if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-- test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-- test -z "$kde_datadir" || test -z "$kde_locale" ||
-- test -z "$kde_cgidir" || test -z "$kde_confdir" ||
-- test -z "$kde_kcfgdir" ||
-- test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-- test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-- test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-- test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-- test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-- test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-- test "x$kde_have_all_paths" != "xyes"; then
-- kde_have_all_paths=no
-- fi
-+#include <Python.h>
-
-- kde_result="$kde_result (cache overridden)"
--fi
--if test "$kde_have_all_paths" = "no"; then
-- { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
--Since it had compiled and linked before, it must be a strange problem on your system.
--Look at config.log for details. If you are not able to fix this, look at
--http://www.kde.org/faq/installation.html or any www.kde.org mirror.
--(If you're using an egcs version on Linux, you may update binutils!)
--" >&5
--echo "$as_me: error: configure could not run a little KDE program to test the environment.
--Since it had compiled and linked before, it must be a strange problem on your system.
--Look at config.log for details. If you are not able to fix this, look at
--http://www.kde.org/faq/installation.html or any www.kde.org mirror.
--(If you're using an egcs version on Linux, you may update binutils!)
--" >&2;}
-- { (exit 1); exit 1; }; }
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_db3=yes
+ { { 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
+@@ -31567,22 +34572,22 @@
+ { (exit 1); exit 1; }; }
else
-- rm -f conftest*
+ rm -f conftest*
- echo "$as_me:$LINENO: result: $kde_result" >&5
-echo "${ECHO_T}$kde_result" >&6
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_db3=no
-+
++ { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
--bindir=$kde_bindir
-+fi
+ bindir=$kde_bindir
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-# Check whether --with-arts or --without-arts was given.
--if test "${with_arts+set}" = set; then
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
- withval="$with_arts"
- build_arts=$withval
++ withval=$with_arts; build_arts=$withval
else
-- build_arts=yes
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ build_arts=yes
-fi;
+fi
-
-+fi
-
--if test "$build_arts" '!=' "no"; then
-- include_ARTS_TRUE=
-- include_ARTS_FALSE='#'
+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- include_ARTS_TRUE='#'
-- include_ARTS_FALSE=
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
- fi
-- if test "$build_arts" = "no"; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
--cat >>confdefs.h <<\_ACEOF
--#define WITHOUT_ARTS 1
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
- _ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ if test "$build_arts" '!=' "no"; then
+@@ -31615,14 +34620,14 @@
-- fi
-+#include <Python.h>
+ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+int
-+main ()
-+{
-
-- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-- if test -n "$KDEDIRS"; then
-- kde_save_IFS=$IFS
-- IFS=:
-- for dir in $KDEDIRS; do
-- kde_default_bindirs="$dir/bin $kde_default_bindirs "
-- done
-- IFS=$kde_save_IFS
-- fi
-+ PySys_SetArgv(1, 0);
-
-- kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "$as_me:$LINENO: checking for dcopidl" >&5
-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
-- if test -n "$DCOPIDL"; then
-- kde_cv_path="$DCOPIDL";
-- else
-- kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
-+kde_cv_try_link_python_m_and_thread_and_db=no
++ { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL"; then
+ kde_cv_path="$DCOPIDL";
+ else
+ kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+fi
+@@ -31665,8 +34670,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/dcopidl"; then
-- if test -n ""
-- then
-- evalstr="$dir/dcopidl 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/dcopidl"
-- break
-- fi
-- else
-- kde_cv_path="$dir/dcopidl"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi
-
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program dcopidl was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
+ { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31677,21 +34682,21 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- DCOPIDL=$kde_cv_path
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL=$kde_cv_path
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
-- if test -n "$DCOPIDL2CPP"; then
-- kde_cv_path="$DCOPIDL2CPP";
-- else
-- kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
-+#include <Python.h>
++ { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL2CPP"; then
+ kde_cv_path="$DCOPIDL2CPP";
+ else
+ kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+int
-+main ()
-+{
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+ PySys_SetArgv(1, 0);
+@@ -31734,8 +34739,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/dcopidl2cpp"; then
-- if test -n ""
-- then
-- evalstr="$dir/dcopidl2cpp 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/dcopidl2cpp"
-- break
-- fi
-- else
-- kde_cv_path="$dir/dcopidl2cpp"
-- break
-- fi
-- fi
-- done
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+kde_cv_try_link_python_pthread_and_dl=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program dcopidl2cpp was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+fi
+ { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31746,22 +34751,22 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- DCOPIDL2CPP=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL2CPP=$kde_cv_path
-- fi
+ fi
-- if test "$build_arts" '!=' "no"; then
-+if test "$kde_python_link_found" = no; then
+ if test "$build_arts" '!=' "no"; then
- echo "$as_me:$LINENO: checking for mcopidl" >&5
-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
-- if test -n "$MCOPIDL"; then
-- kde_cv_path="$MCOPIDL";
-- else
-- kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
++ { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+ if test -n "$MCOPIDL"; then
+ kde_cv_path="$MCOPIDL";
+ else
+ kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -31804,8 +34809,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/mcopidl"; then
-- if test -n ""
-- then
-- evalstr="$dir/mcopidl 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/mcopidl"
-- break
-- fi
-- else
-- kde_cv_path="$dir/mcopidl"
-- break
-- fi
-- fi
-- done
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&5
--echo "$as_me: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&2;}
-- { (exit 1); exit 1; }; }
-+fi
+ { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31818,21 +34823,21 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MCOPIDL=$kde_cv_path
-+fi
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MCOPIDL=$kde_cv_path
-- fi
+ fi
- echo "$as_me:$LINENO: checking for artsc-config" >&5
-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-- if test -n "$ARTSCCONFIG"; then
-- kde_cv_path="$ARTSCCONFIG";
-- else
-- kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+ if test -n "$ARTSCCONFIG"; then
+ kde_cv_path="$ARTSCCONFIG";
+ else
+ kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -31875,8 +34880,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/artsc-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/artsc-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/artsc-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/artsc-config"
-- break
-- fi
-- fi
-- done
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&5
--echo "$as_me: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&2;}
-- { (exit 1); exit 1; }; }
-+fi
+ { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31889,22 +34894,22 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- ARTSCCONFIG=$kde_cv_path
-+fi
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ ARTSCCONFIG=$kde_cv_path
-- fi
+ fi
-- fi
+ fi
- echo "$as_me:$LINENO: checking for meinproc" >&5
-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
-- if test -n "$MEINPROC"; then
-- kde_cv_path="$MEINPROC";
-- else
-- kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++ { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+ if test -n "$MEINPROC"; then
+ kde_cv_path="$MEINPROC";
+ else
+ kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
+@@ -31947,12 +34952,12 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/meinproc"; then
-- if test -n ""
-- then
-- evalstr="$dir/meinproc 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/meinproc"
-- break
-- fi
-- else
-- kde_cv_path="$dir/meinproc"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-
- fi
-
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+else
-+ kde_python_link_found=no
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MEINPROC=$kde_cv_path
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MEINPROC=$kde_cv_path
-- fi
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
+ fi
+@@ -31981,14 +34986,14 @@
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test -n "$kde32ornewer"; then
-- kde32ornewer=1
-- kde33ornewer=1
-- if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-- kde32ornewer=
-- kde33ornewer=
-- else
-- if test "$kde_qtver" = "3"; then
-- if test "$kde_qtsubver" -le 1; then
-- kde32ornewer=
-- fi
-- if test "$kde_qtsubver" -le 2; then
-- kde33ornewer=
-- fi
-- if test "$KDECONFIG" != "compiled"; then
-- if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-- kde33ornewer=
-- fi
-- fi
-- fi
-- fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- if test -n "$kde32ornewer"; then
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
-- if test -n "$KCONFIG_COMPILER"; then
-- kde_cv_path="$KCONFIG_COMPILER";
-- else
-- kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
-+#include <Python.h>
++ { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+ if test -n "$KCONFIG_COMPILER"; then
+ kde_cv_path="$KCONFIG_COMPILER";
+ else
+ kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+int
-+main ()
-+{
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+ PySys_SetArgv(1, 0);
+@@ -32031,8 +35036,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/kconfig_compiler"; then
-- if test -n ""
-- then
-- evalstr="$dir/kconfig_compiler 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/kconfig_compiler"
-- break
-- fi
-- else
-- kde_cv_path="$dir/kconfig_compiler"
-- break
-- fi
-- fi
-- done
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+kde_cv_try_link_python_normal=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program kconfig_compiler was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+fi
+ { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32043,21 +35048,21 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- KCONFIG_COMPILER=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KCONFIG_COMPILER=$kde_cv_path
-- fi
+ fi
-+if test "$kde_python_link_found" = no; then
- echo "$as_me:$LINENO: checking for dcopidlng" >&5
-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
-- if test -n "$DCOPIDLNG"; then
-- kde_cv_path="$DCOPIDLNG";
-- else
-- kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
++ { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+ if test -n "$DCOPIDLNG"; then
+ kde_cv_path="$DCOPIDLNG";
+ else
+ kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -32100,8 +35105,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/dcopidlng"; then
-- if test -n ""
-- then
-- evalstr="$dir/dcopidlng 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/dcopidlng"
-- break
-- fi
-- else
-- kde_cv_path="$dir/dcopidlng"
-- break
-- fi
-- fi
-- done
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
--fi
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+kde_cv_try_link_python_m=no
-
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program dcopidlng was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
-- { (exit 1); exit 1; }; }
+ { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32112,8 +35117,8 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- DCOPIDLNG=$kde_cv_path
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDLNG=$kde_cv_path
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ fi
+@@ -32121,14 +35126,14 @@
+ fi
+ if test -n "$kde33ornewer"; then
-- fi
-- if test -n "$kde33ornewer"; then
-+fi
-
- echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
-- if test -n "$MAKEKDEWIDGETS"; then
-- kde_cv_path="$MAKEKDEWIDGETS";
-- else
-- kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
-+fi
++ { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+ if test -n "$MAKEKDEWIDGETS"; then
+ kde_cv_path="$MAKEKDEWIDGETS";
+ else
+ kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$kde_default_bindirs $dirs"
-- else dirs="$dirs $kde_default_bindirs"
-- fi
-- IFS=$kde_save_IFS
+@@ -32171,8 +35176,8 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/makekdewidgets"; then
-- if test -n ""
-- then
-- evalstr="$dir/makekdewidgets 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/makekdewidgets"
-- break
-- fi
-- else
-- kde_cv_path="$dir/makekdewidgets"
-- break
-- fi
-- fi
-- done
-+if test "$kde_python_link_found" = no; then
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
--fi
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+#include <Python.h>
-
-- fi
-+int
-+main ()
-+{
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+ PySys_SetArgv(1, 0);
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
--Please check whether you installed KDE correctly.
--" >&5
--echo "$as_me: error: The important program makekdewidgets was not found!
--Please check whether you installed KDE correctly.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32183,8 +35188,8 @@
+ { (exit 1); exit 1; }; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MAKEKDEWIDGETS=$kde_cv_path
-+kde_cv_try_link_python_pthread=no
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MAKEKDEWIDGETS=$kde_cv_path
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ fi
+@@ -32192,14 +35197,14 @@
-+fi
+ fi
-- fi
-
- echo "$as_me:$LINENO: checking for xmllint" >&5
-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-- if test -n "$XMLLINT"; then
-- kde_cv_path="$XMLLINT";
-- else
-- kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
++ { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+ if test -n "$XMLLINT"; then
+ kde_cv_path="$XMLLINT";
+ else
+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
-- fi
-- IFS=$kde_save_IFS
-+fi
-+
-+fi
+@@ -32242,12 +35247,12 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/xmllint"; then
-- if test -n ""
-- then
-- evalstr="$dir/xmllint 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/xmllint"
-- break
-- fi
-- else
-- kde_cv_path="$dir/xmllint"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
- fi
-
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- XMLLINT=""
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ XMLLINT=""
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- XMLLINT=$kde_cv_path
-+#include <Python.h>
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XMLLINT=$kde_cv_path
-- fi
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-- if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--KDE_XSL_STYLESHEET=NO
--for i in $kde_sharedirs;
--do
-- for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-- do
-- echo "configure: 32267: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- KDE_XSL_STYLESHEET=$i
-- break 2
-- fi
-- done
--done
-+kde_cv_try_link_python_tcl=no
-
-- if test "$KDE_XSL_STYLESHEET" = "NO"; then
-- KDE_XSL_STYLESHEET=""
-- else
-- KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-- fi
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- DCOP_DEPENDENCIES='$(DCOPIDL)'
-- if test -n "$kde32ornewer"; then
-- KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-- DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-+fi
-
-
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_db2=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
--kdeinitdir='$(kde_moduledir)'
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_m_and_thread=no
-
--if test "$kde_qtver" = 1; then
-- kde_minidir="$kde_icondir/mini"
--else
--# for KDE 1 - this breaks KDE2 apps using minidir, but
--# that's the plan ;-/
-- kde_minidir="/dev/null"
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
--if test $kde_qtver = 3; then
-- case $host in
-- *cygwin*) lib_kded="-lkdeinit_kded" ;;
-- *) lib_kded="" ;;
-- esac
-- LIB_KDED=$lib_kded
--
-- LIB_KDECORE="-lkdecore"
-+fi
-
-- LIB_KDEUI="-lkdeui"
-
-- LIB_KIO="-lkio"
-
-- LIB_KJS="-lkjs"
-+if test "$kde_python_link_found" = no; then
-
-- LIB_SMB="-lsmb"
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-
-- LIB_KAB="-lkab"
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- LIB_KABC="-lkabc"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- LIB_KHTML="-lkhtml"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- LIB_KSPELL="-lkspell"
-+#include <Python.h>
-
-- LIB_KPARTS="-lkparts"
-+int
-+main ()
-+{
-
-- LIB_KDEPRINT="-lkdeprint"
-+ PySys_SetArgv(1, 0);
-
-- LIB_KUTILS="-lkutils"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- LIB_KDEPIM="-lkdepim"
-+kde_cv_try_link_python_m_and_thread_and_util=no
-
-- LIB_KIMPROXY="-lkimproxy"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- LIB_KNEWSTUFF="-lknewstuff"
-+fi
-
-- LIB_KDNSSD="-lkdnssd"
-
-- LIB_KUNITTEST="-lkunittest"
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-
--# these are for backward compatibility
-- LIB_KSYCOCA="-lkio"
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- LIB_KFILE="-lkio"
-+fi
-
--elif test $kde_qtver = 2; then
-- LIB_KDECORE="-lkdecore"
-+fi
-
-- LIB_KDEUI="-lkdeui"
-
-- LIB_KIO="-lkio"
-
-- LIB_KSYCOCA="-lksycoca"
-+if test "$kde_python_link_found" = no; then
-
-- LIB_SMB="-lsmb"
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-
-- LIB_KFILE="-lkfile"
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-- LIB_KAB="-lkab"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- LIB_KHTML="-lkhtml"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- LIB_KSPELL="-lkspell"
-+#include <Python.h>
-
-- LIB_KPARTS="-lkparts"
-+int
-+main ()
-+{
-
-- LIB_KDEPRINT="-lkdeprint"
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
- else
-- LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
--
-- LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
--
-- LIB_KFM="-lkfm $(LIB_KDECORE)"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-
-- LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
-
-
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-
--#MIN_CONFIG(3.3)
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h
-+fi
-
--CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-
--for ac_header in unistd.h sys/param.h floatingpoint.h paths.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ fi
+@@ -32262,7 +35267,7 @@
+ do
+ for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+ do
+- echo "configure: 32265: $i/$j" >&5
++ echo "configure: 35270: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ KDE_XSL_STYLESHEET=$i
+@@ -32431,18 +35436,19 @@
+ for ac_header in unistd.h sys/param.h floatingpoint.h paths.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
else
-- # Is the header compilable?
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ return 0;
-+}
+@@ -32453,23 +35459,36 @@
+ #include <$ac_header>
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -32469,144 +55637,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_header_compiler=yes
-+ kde_cv_try_link_python_pthread_and_db3=yes
- else
+@@ -32478,15 +35497,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+kde_cv_try_link_python_pthread_and_db3=no
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32495,8 +35515,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
- fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++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
+@@ -32520,9 +35545,10 @@
-- ac_header_preproc=no
+ ac_header_preproc=no
fi
--rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -32546,25 +35572,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -55633,1323 +34827,470 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -32576,8 +35596,8 @@
- fi
+ done
--done
-
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
--if test "${ac_cv_c_bigendian+set}" = set; then
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- # See if sys/param.h defines the BYTE_ORDER macro.
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
--#include <sys/param.h>
-+
-+#include <Python.h>
-
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-- bogus endian macros
--#endif
-+
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
+@@ -32603,23 +35623,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -32619,36 +55733,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- # It does; now see whether it defined to BIG_ENDIAN or not.
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
--#include <sys/param.h>
-+
-+#include <Python.h>
-
- int
- main ()
- {
--#if BYTE_ORDER != BIG_ENDIAN
-- not big endian
--#endif
-+
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
+@@ -32645,23 +35678,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -32661,51 +55829,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_c_bigendian=yes
-+ kde_cv_try_link_python_pthread_and_dl=yes
- else
+@@ -32670,14 +35716,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
-+kde_cv_try_link_python_pthread_and_dl=no
-+
++ ac_cv_c_bigendian=no
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-# It does not; compile a test program.
--if test "$cross_compiling" = yes; then
-- # try to guess the endianness by grepping values into an object file
-- ac_cv_c_bigendian=unknown
-- cat >conftest.$ac_ext <<_ACEOF
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
++ # It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+ # try to guess the endianness by grepping values into an object file
+ ac_cv_c_bigendian=unknown
+@@ -32687,11 +35734,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
--void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
--void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+
-+#include <Python.h>
-+
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
- {
-- _ascii (); _ebcdic ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -32702,23 +35749,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -32718,883 +55925,1242 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-- ac_cv_c_bigendian=yes
--fi
--if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-- if test "$ac_cv_c_bigendian" = unknown; then
-- ac_cv_c_bigendian=no
-- else
-- # finding both strings is unlikely to happen, but who knows?
-- ac_cv_c_bigendian=unknown
-- fi
--fi
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
+@@ -32737,7 +35797,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread_and_panel_curses=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
-- cat >conftest.$ac_ext <<_ACEOF
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -32746,27 +35808,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-+
-+#include <Python.h>
-+
++$ac_includes_default
int
main ()
{
-- /* Are we little or big endian? From Harbison&Steele. */
-- union
-- {
++
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
- long l;
- char c[sizeof (long)];
-- } u;
-- u.l = 1;
++ long int l;
++ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
++ return u.c[sizeof (long int) - 1] == 1;
+
-+ PySys_SetArgv(1, 0);
-+
+ ;
+ return 0;
}
_ACEOF
--rm -f conftest$ac_exeext
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&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
++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'
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
-- ac_cv_c_bigendian=no
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--( exit $ac_status )
--ac_cv_c_bigendian=yes
--fi
+@@ -32779,13 +35855,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
++
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
--case $ac_cv_c_bigendian in
-- yes)
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in
+ yes)
--cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
--_ACEOF
-- ;;
-- no)
-- ;;
-- *)
-- { { echo "$as_me:$LINENO: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--echo "$as_me: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-- { (exit 1); exit 1; }; } ;;
--esac
+@@ -32804,8 +35883,8 @@
+ esac
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
-echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
--if test "${ac_cv_maxpathlen+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
++echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6; }
+ if test "${ac_cv_maxpathlen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
+@@ -32841,8 +35920,8 @@
--cat > conftest.$ac_ext <<EOF
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--#include <stdio.h>
--#include <sys/param.h>
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 1024
--#endif
-+fi
+ fi
--KDE_HELLO MAXPATHLEN
-+fi
-
--EOF
-
--ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
--if { (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); } && test -s conftest.out; then
-- ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
--else
-- ac_cv_maxpathlen=1024
--fi
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-
--rm conftest.*
-
-
--fi
-
-echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
-echo "${ECHO_T}$ac_cv_maxpathlen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
++echo "${ECHO_T}$ac_cv_maxpathlen" >&6; }
--cat >>confdefs.h <<_ACEOF
--#define KDEMAXPATHLEN $ac_cv_maxpathlen
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
- _ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define KDEMAXPATHLEN $ac_cv_maxpathlen
+@@ -32851,8 +35930,8 @@
-+fi
-
-echo "$as_me:$LINENO: checking for Qt docs" >&5
-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
--kde_qtdir=
--if test "${with_qt_dir+set}" = set; then
-- kde_qtdir="$with_qt_dir"
--fi
-+else
-+ kde_python_link_found=no
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+ kde_qtdir="$with_qt_dir"
+@@ -32864,7 +35943,7 @@
+ do
+ for j in qsql.html;
+ do
+- echo "configure: 32867: $i/$j" >&5
++ echo "configure: 35946: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ QTDOCDIR=$i
+@@ -32873,20 +35952,20 @@
+ done
+ done
-+if test "$kde_python_link_found" = no; then
-
--QTDOCDIR=NO
--for i in $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ;
--do
-- for j in qsql.html;
-- do
-- echo "configure: 32869: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- QTDOCDIR=$i
-- break 2
-- fi
-- done
--done
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-
-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-echo "${ECHO_T}$QTDOCDIR" >&6
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <Python.h>
- echo "$as_me:$LINENO: checking for dot" >&5
-echo $ECHO_N "checking for dot... $ECHO_C" >&6
-- if test -n "$DOT"; then
-- kde_cv_path="$DOT";
-- else
-- kde_cache=`echo dot | sed 'y%./+-%__p_%'`
-+int
-+main ()
-+{
++ { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+ if test -n "$DOT"; then
+ kde_cv_path="$DOT";
+ else
+ kde_cache=`echo dot | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs=" $dirs"
-- else dirs="$dirs "
-- fi
-- IFS=$kde_save_IFS
-+kde_cv_try_link_python_normal=no
+@@ -32929,12 +36008,12 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/dot"; then
-- if test -n ""
-- then
-- evalstr="$dir/dot 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/dot"
-- break
-- fi
-- else
-- kde_cv_path="$dir/dot"
-- break
-- fi
-- fi
-- done
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+fi
-
-
--fi
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+fi
-
-- fi
-+fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- DOT=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DOT=$kde_cv_path
-- fi
-+if test "$kde_python_link_found" = no; then
-
--if test -n "$DOT"; then
-- KDE_HAVE_DOT="YES"
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- KDE_HAVE_DOT="NO"
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
+ fi
+@@ -32946,14 +36025,14 @@
fi
--
+
- echo "$as_me:$LINENO: checking for doxygen" >&5
-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
-- if test -n "$DOXYGEN"; then
-- kde_cv_path="$DOXYGEN";
-- else
-- kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+ if test -n "$DOXYGEN"; then
+ kde_cv_path="$DOXYGEN";
+ else
+ kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs=" $dirs"
-- else dirs="$dirs "
-- fi
-- IFS=$kde_save_IFS
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -32996,12 +36075,12 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/doxygen"; then
-- if test -n ""
-- then
-- evalstr="$dir/doxygen 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/doxygen"
-- break
-- fi
-- else
-- kde_cv_path="$dir/doxygen"
-- break
-- fi
-- fi
-- done
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+#include <Python.h>
-
-+int
-+main ()
-+{
-
--fi
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+kde_cv_try_link_python_m=no
-
-- fi
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- DOXYGEN=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DOXYGEN=$kde_cv_path
-- fi
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
+ fi
+@@ -33026,14 +36105,14 @@
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ have_imagemagick=no
-+fi
-
--DOXYGEN_PROJECT_NAME="The KOffice API Reference"
--DOXYGEN_PROJECT_NUMBER="Version $VERSION"
-+fi
-
-
-
--KDE_HAS_DOXYGEN=no
--if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-- KDE_HAS_DOXYGEN=yes
--fi
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--# Check for ImageMagick...
-+#include <Python.h>
-
--have_imagemagick=no
-+int
-+main ()
-+{
-
- echo "$as_me:$LINENO: checking for Magick-config" >&5
-echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6
-- if test -n "$MAGICK_CONFIG"; then
-- kde_cv_path="$MAGICK_CONFIG";
-- else
-- kde_cache=`echo Magick-config | sed 'y%./+-%__p_%'`
-+ PySys_SetArgv(1, 0);
++ { echo "$as_me:$LINENO: checking for Magick-config" >&5
++echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6; }
+ if test -n "$MAGICK_CONFIG"; then
+ kde_cv_path="$MAGICK_CONFIG";
+ else
+ kde_cache=`echo Magick-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread=yes
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
-+kde_cv_try_link_python_pthread=no
+@@ -33076,15 +36155,15 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/Magick-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/Magick-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/Magick-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/Magick-config"
-- break
-- fi
-- fi
-- done
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+fi
-
-
--fi
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+fi
-
-- fi
-+fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { echo "$as_me:$LINENO: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&5
--echo "$as_me: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&2;}
+ { echo "$as_me:$LINENO: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&5
+ echo "$as_me: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&2;}
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MAGICK_CONFIG=$kde_cv_path
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MAGICK_CONFIG=$kde_cv_path
-- fi
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
+ fi
+@@ -33167,12 +36246,11 @@
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ # --- Check for KDE 3.2 or 3.3 ---
--if test -n "$MAGICK_CONFIG"; then
-- vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 5005002
-- then
-- if test "$vers" -ge 6000003
-- then
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MAGICK6 1
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
- _ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- fi
-- if test "$vers" -ge 6001000
-- then
-+#include <Python.h>
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MAGICK61 1
--_ACEOF
-+int
-+main ()
-+{
-
-- fi
-- LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
-- LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`"
-- LIBMAGICK_RPATH=
-- for args in $LIBMAGICK_LIBS; do
-- case $args in
-- -L*)
-- LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-- ;;
-- esac
-- done
-- LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"`
-- LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`"
-+ PySys_SetArgv(1, 0);
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MAGICK 1
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_tcl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- have_imagemagick=yes
-- else
-- { echo "$as_me:$LINENO: WARNING: You need at least ImageMagick 5.5.2" >&5
--echo "$as_me: WARNING: You need at least ImageMagick 5.5.2" >&2;}
-+kde_cv_try_link_python_tcl=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
- fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
--if test ! "$USE_RPATH" = "yes"; then
-- LIBMAGICK_RPATH=
- fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
--if test "$have_imagemagick" = "yes" -a HAVE_MAGICK61; then
-- include_imagemagick_filter_TRUE=
-- include_imagemagick_filter_FALSE='#'
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_db2=yes
- else
-- include_imagemagick_filter_TRUE='#'
-- include_imagemagick_filter_FALSE=
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
--# End of ImageMagick check
-
--##########################################################################
--# This last check is copied from kdenonbeta/gsf/configure.in.in
--##########################################################################
--# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
--# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
--# also defines GSTUFF_PKG_ERRORS on error
--# Note: This is specially tweaked for karbon's fontconfig check. Please fix
--# it before using it for other tests :-)
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--# --- Check for KDE 3.2 or 3.3 ---
-+fi
-
-echo "$as_me:$LINENO: checking for KDE version" >&5
-echo $ECHO_N "checking for KDE version... $ECHO_C" >&6
-+fi
+-
++{ echo "$as_me:$LINENO: checking for KDE version" >&5
++echo $ECHO_N "checking for KDE version... $ECHO_C" >&6; }
-
- 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
-+if test "$kde_python_link_found" = no; then
++ 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'
+@@ -33195,23 +36273,36 @@
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--kdeversion_save_CXXFLAGS="$CXXFLAGS"
--kdeversion_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
--CXXFLAGS="$CXXFLAGS $all_includes"
-+#include <Python.h>
-
--cat >conftest.$ac_ext <<_ACEOF
-+int
-+main ()
-+{
-
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
--#error KDE 3.2
--#endif
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ return 0;
-+}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -56957,108 +35298,55 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- need_kde32_compat="no"
--
-+ kde_cv_try_link_python_m_and_thread=yes
- else
+@@ -33221,9 +36312,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-need_kde32_compat="yes"
-+kde_cv_try_link_python_m_and_thread=no
++ need_kde32_compat="yes"
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+@@ -33235,23 +36327,36 @@
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
--#error KDE 3.3
--#endif
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ return 0;
-+}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -57066,108 +35354,55 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- need_kde33_compat="no"
--
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
+@@ -33261,9 +36366,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-need_kde33_compat="yes"
-+kde_cv_try_link_python_m_and_thread_and_util=no
++ need_kde33_compat="yes"
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+@@ -33275,23 +36381,36 @@
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
--#error KDE 3.4
--#endif
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ return 0;
-+}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -57175,108 +35410,55 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- need_kde34_compat="no"
--
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
- else
+@@ -33301,9 +36420,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-need_kde34_compat="yes"
-+kde_cv_try_link_python_m_and_thread_and_db3=no
++ need_kde34_compat="yes"
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+@@ -33315,23 +36435,36 @@
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
--#error KDE 3.5.x (x < 2)
--#endif
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ return 0;
-+}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -57284,1365 +35466,682 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- need_kde351_compat="no"
--
-+ kde_cv_try_link_python_pthread_and_db3=yes
- else
+@@ -33341,9 +36474,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-need_kde351_compat="yes"
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--CXXFLAGS="$kdeversion_save_CXXFLAGS"
--LIBS="$kdeversion_safe_LIBS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-+kde_cv_try_link_python_pthread_and_db3=no
++ need_kde351_compat="yes"
--if test "$need_kde32_compat" = "yes"; then
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$kdeversion_save_CXXFLAGS"
+ LIBS="$kdeversion_safe_LIBS"
+@@ -33355,23 +36489,23 @@
+
+
+ if test "$need_kde32_compat" = "yes"; then
- echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
-echo "${ECHO_T}KDE 3.2.x" >&6
--else
-- if test "$need_kde33_compat" = "yes"; then
++ { echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
++echo "${ECHO_T}KDE 3.2.x" >&6; }
+ else
+ if test "$need_kde33_compat" = "yes"; then
- echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
-echo "${ECHO_T}KDE 3.3.x" >&6
-- else
-- if test "$need_kde34_compat" = "yes"; then
++ { echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
++echo "${ECHO_T}KDE 3.3.x" >&6; }
+ else
+ if test "$need_kde34_compat" = "yes"; then
- echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
-echo "${ECHO_T}KDE 3.4.x" >&6
-- else
-- if test "$need_kde351_compat" = "yes"; then
++ { echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
++echo "${ECHO_T}KDE 3.4.x" >&6; }
+ else
+ if test "$need_kde351_compat" = "yes"; then
- echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
-echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6
-- else
++ { echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
++echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6; }
+ else
- echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
-echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6
-- fi
-- fi
-- fi
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ { echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
++echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6; }
+ fi
+ fi
+ fi
+@@ -33435,14 +36569,14 @@
+ # --- OpenEXR check ---
--
--
--if test "$need_kde32_compat" = "yes"; then
-- need_kde32_compatibility_TRUE=
-- need_kde32_compatibility_FALSE='#'
--else
-- need_kde32_compatibility_TRUE='#'
-- need_kde32_compatibility_FALSE=
- fi
-
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-
--if test "$need_kde33_compat" = "yes"; then
-- need_kde33_compatibility_TRUE=
-- need_kde33_compatibility_FALSE='#'
- else
-- need_kde33_compatibility_TRUE='#'
-- need_kde33_compatibility_FALSE=
--fi
--
--
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
--if test "$need_kde34_compat" = "yes"; then
-- need_kde34_compatibility_TRUE=
-- need_kde34_compatibility_FALSE='#'
--else
-- need_kde34_compatibility_TRUE='#'
-- need_kde34_compatibility_FALSE=
- fi
-
--
--
--if test "$need_kde351_compat" = "yes"; then
-- need_kde351_compatibility_TRUE=
-- need_kde351_compatibility_FALSE='#'
--else
-- need_kde351_compatibility_TRUE='#'
-- need_kde351_compatibility_FALSE=
- fi
-
-
--# Keep the old KDE 3.1 test, as long as it is still used
-
-+if test "$kde_python_link_found" = no; then
-
--if test "supported" = "no"; then
-- need_kde31_compatibility_TRUE=
-- need_kde31_compatibility_FALSE='#'
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- need_kde31_compatibility_TRUE='#'
-- need_kde31_compatibility_FALSE=
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
- fi
-
--
--# --- End KDE 3.2 check ---
--
--# --- OpenEXR check ---
--
--
- echo "$as_me:$LINENO: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-- if test -n "$PKGCONFIG"; then
-- kde_cv_path="$PKGCONFIG";
-- else
-- kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for pkg-config" >&5
++echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
+ if test -n "$PKGCONFIG"; then
+ kde_cv_path="$PKGCONFIG";
+ else
+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/pkg-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/pkg-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+@@ -33485,22 +36619,22 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
--echo "$as_me: WARNING: Could not find pkg-config" >&2;}
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
+ echo "$as_me: WARNING: Could not find pkg-config" >&2;}
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- PKGCONFIG=$kde_cv_path
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PKGCONFIG=$kde_cv_path
-- fi
-+#include <Python.h>
+ fi
-+int
-+main ()
-+{
-echo "$as_me:$LINENO: checking for OpenEXR" >&5
-echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6
-+ PySys_SetArgv(1, 0);
++{ echo "$as_me:$LINENO: checking for OpenEXR" >&5
++echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6; }
--if test -n "$PKGCONFIG"; then
-- vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
-- if test -n "$vers"
-- then
-- OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`"
-- OPENEXR_RPATH=
-- for args in $OPENEXR_LIBS; do
-- case $args in
-- -L*)
-- OPENEXR_RPATH="$OPENEXR_RPATH $args"
-- ;;
-- esac
-- done
-- OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"`
-- OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`"
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ if test -n "$PKGCONFIG"; then
+ vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
+@@ -33532,11 +36666,11 @@
-+kde_cv_try_link_python_m_and_thread_and_db=no
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_OPENEXR 1
--_ACEOF
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-- fi
- fi
-
--if test ! "$USE_RPATH" = "yes"; then
-- OPENEXR_RPATH=
--fi
-
--if test -n "$OPENEXR_LIBS"
--then
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else
+ if test -n "$OPENEXR_LIBS"
+ then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--fi
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
--if test -n "$OPENEXR_LIBS"; then
-- have_openexr_TRUE=
-- have_openexr_FALSE='#'
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- have_openexr_TRUE='#'
-- have_openexr_FALSE=
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
fi
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
--# --- End of OpenEXR check ---
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -33567,16 +36701,15 @@
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
--DO_NOT_COMPILE="$DO_NOT_COMPILE example"
-+#include <Python.h>
--# Check if the tiff lib is available
-+int
-+main ()
-+{
-
-+ PySys_SetArgv(1, 0);
-
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_pthread_and_dl=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-echo "$as_me:$LINENO: checking for libtiff tiff" >&5
-echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
++{ echo "$as_me:$LINENO: checking for libtiff tiff" >&5
++echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6; }
--if test "${kde_cv_libtiff_tiff+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${kde_cv_libtiff_tiff+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+fi
-
+-
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-+if test "$kde_python_link_found" = no; then
-
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
--LIBS="$all_libraries $USER_LDFLAGS -ltiff $LIBJPEG $LIBZ -lm"
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
- fi
--kde_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -33603,12 +57169,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#include<tiffio.h>
-+#include <Python.h>
-
- int
- main ()
- {
--return (TIFFOpen( "", "r") == 0);
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
++ 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'
+@@ -33612,23 +36745,36 @@
}
-@@ -33622,7 +57190,7 @@
+ _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'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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=$?
-@@ -33634,63 +57202,61 @@
+ 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
--
-- kde_cv_libtiff_tiff="-ltiff $LIBJPEG $LIBZ"
--
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33643,6 +36789,7 @@
+ kde_cv_libtiff_tiff=no
--
-- kde_cv_libtiff_tiff=no
-+kde_cv_try_link_python_pthread_and_panel_curses=no
-
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--
--LIBS="$kde_save_LIBS"
--CXXFLAGS="$kde_save_CXXFLAGS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
- fi
+@@ -33659,20 +36806,19 @@
--if test "$kde_cv_libtiff_tiff" = "no"; then
+ if test "$kde_cv_libtiff_tiff" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- LIBTIFF=""
--
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBTIFF=""
+
-echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
-echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
++{ echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
++echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6; }
--if test "${kde_cv_libtiff_tiff34+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${kde_cv_libtiff_tiff34+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+fi
-
+-
- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-+if test "$kde_python_link_found" = no; then
-
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
--LIBS="$all_libraries $USER_LDFLAGS -ltiff34 $LIBJPEG $LIBZ -lm"
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
- fi
--kde_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -33699,12 +57265,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#include<tiffio.h>
-+#include <Python.h>
-
- int
- main ()
- {
--return (TIFFOpen( "", "r") == 0);
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
++ 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'
+@@ -33708,23 +36854,36 @@
}
-@@ -33718,7 +57286,7 @@
+ _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'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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=$?
-@@ -33730,94 +57298,180 @@
+ 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
--
-- kde_cv_libtiff_tiff34="-ltiff34 $LIBJPEG $LIBZ"
--
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33739,6 +36898,7 @@
+ kde_cv_libtiff_tiff34=no
--
-- kde_cv_libtiff_tiff34=no
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
--LIBS="$kde_save_LIBS"
--CXXFLAGS="$kde_save_CXXFLAGS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
+@@ -33755,14 +36915,14 @@
-+fi
- fi
-
-
--if test "$kde_cv_libtiff_tiff34" = "no"; then
+ if test "$kde_cv_libtiff_tiff34" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- LIBTIFF=""
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBTIFF=""
--else
-- LIBTIFF="$kde_cv_libtiff_tiff34"
+ else
+ LIBTIFF="$kde_cv_libtiff_tiff34"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBTIFF 1
--_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTIFF 1
+@@ -33774,8 +36934,8 @@
-
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
- fi
-
-
-+
else
-- LIBTIFF="$kde_cv_libtiff_tiff"
+ LIBTIFF="$kde_cv_libtiff_tiff"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=no
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBTIFF 1
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
- _ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTIFF 1
+@@ -33802,8 +36962,8 @@
-+#include <Python.h>
--fi
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_normal=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_normal=no
-
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
-+fi
-
-
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-
--if test -n "$LIBTIFF"; then
-- have_tiff_TRUE=
-- have_tiff_FALSE='#'
- else
-- have_tiff_TRUE='#'
-- have_tiff_FALSE=
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
-echo "$as_me:$LINENO: checking for libpng" >&5
-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
--if test "${ac_cv_lib_png+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
--fi
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -33826,15 +57480,13 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include<png.h>
-+#include <Python.h>
-
- int
- main ()
- {
-
-- png_structp png_ptr = png_create_read_struct( /* image ptr */
-- PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-- return( png_ptr != 0 );
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
-@@ -33861,60 +57513,62 @@
+@@ -33839,23 +36999,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
-- eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-+ kde_cv_try_link_python_m=yes
- else
+@@ -33864,9 +37037,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_png=no"
-+kde_cv_try_link_python_m=no
++ eval "ac_cv_lib_png=no"
fi
++
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS="$kde_save_LIBS"
+@@ -33881,11 +37055,11 @@
- fi
--if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
+ LIBPNG="$ac_cv_lib_png"
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBPNG 1
--_ACEOF
-
-- LIBPNG="$ac_cv_lib_png"
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-
- echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-echo "${ECHO_T}$ac_cv_lib_png" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- LIBPNG=""
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ LIBPNG=""
fi
+@@ -33903,8 +37077,8 @@
--
--
--if test -n "$LIBPNG"; then
-- have_png_TRUE=
-- have_png_FALSE='#'
--else
-- have_png_TRUE='#'
-- have_png_FALSE=
- fi
-
-+if test "$kde_python_link_found" = no; then
-
-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
--if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+@@ -33937,23 +37111,36 @@
+ }
_ACEOF
-@@ -33922,18 +57576,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--void jpeg_CreateDecompress();
--#ifdef __cplusplus
--}
--#endif
-+#include <Python.h>
-
- int
- main ()
- {
--jpeg_CreateDecompress();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -33959,39 +57609,62 @@
+ 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
-- eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-+ kde_cv_try_link_python_pthread=yes
- else
+@@ -33962,8 +37149,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_6b=no"
-+kde_cv_try_link_python_pthread=no
++ eval "ac_cv_lib_jpeg_6b=no"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS="$ac_save_LIBS"
+@@ -33974,14 +37162,14 @@
- fi
-
-
--if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-- LIBJPEG="$ac_cv_lib_jpeg_6b"
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_6b"
- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
-echo "$as_me:$LINENO: checking for libjpeg" >&5
-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
--if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+@@ -34014,23 +37202,36 @@
+ }
_ACEOF
-@@ -33999,18 +57672,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--void jpeg_CreateDecompress();
--#ifdef __cplusplus
--}
--#endif
-+#include <Python.h>
-
- int
- main ()
- {
--jpeg_CreateDecompress();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -34036,574 +57705,276 @@
+ 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
-- eval "ac_cv_lib_jpeg_normal=-ljpeg"
-+ kde_cv_try_link_python_tcl=yes
- else
+@@ -34039,8 +37240,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_normal=no"
-+kde_cv_try_link_python_tcl=no
++ eval "ac_cv_lib_jpeg_normal=no"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ LIBS="$ac_save_LIBS"
+@@ -34051,11 +37253,11 @@
- fi
-
-
--if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-- LIBJPEG="$ac_cv_lib_jpeg_normal"
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_normal"
- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
-- LIBJPEG=
--
--
--fi
--
--
--
- fi
+ LIBJPEG=
--
--
--jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
--
--jpeg_incdir=NO
--for i in $jpeg_incdirs;
--do
-- for j in jpeglib.h;
-- do
-- echo "configure: 34080: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- jpeg_incdir=$i
-- break 2
-- fi
-- done
--done
--
--test "x$jpeg_incdir" = xNO && jpeg_incdir=
--
--if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBJPEG 1
--_ACEOF
--
--else
-- if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-- { echo "$as_me:$LINENO: WARNING:
--There is an installation error in jpeg support. You seem to have only one
--of either the headers _or_ the libraries installed. You may need to either
--provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
--Disabling JPEG support.
--" >&5
--echo "$as_me: WARNING:
--There is an installation error in jpeg support. You seem to have only one
--of either the headers _or_ the libraries installed. You may need to either
--provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
--Disabling JPEG support.
--" >&2;}
-- else
-- { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
--echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-- fi
-- jpeg_incdir=
-- LIBJPEG=
- fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
--
--
--
--if test -n "$LIBJPEG"; then
-- have_jpeg_TRUE=
-- have_jpeg_FALSE='#'
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- have_jpeg_TRUE='#'
-- have_jpeg_FALSE=
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
- fi
-
--
--#---------------------------------------------------------
--# libexif detection
--# taken from libkexif's configure.in.in
--#---------------------------------------------------------
--
--LIBEXIF=no
--
--#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, ,
--# [ AC_MSG_WARN([libexif >= 0.5.7 not found.])
--# LIBEXIF=yes ])
--
--
--#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9,
--# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]),
--# AC_MSG_WARN([Using old version of libexif.]))
--
--
-- succeeded=no
--
-- 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
+@@ -34075,7 +37277,7 @@
+ do
+ for j in jpeglib.h;
+ do
+- echo "configure: 34078: $i/$j" >&5
++ echo "configure: 37280: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ jpeg_incdir=$i
+@@ -34153,8 +37355,8 @@
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- 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
+@@ -34169,28 +37371,29 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
--if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
--else
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
-- fi
--
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** The pkg-config script could not be found. Make sure it is"
-- echo "*** in your path, or set the PKG_CONFIG environment variable"
-- echo "*** to the full path to pkg-config."
-- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
++
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+@@ -34201,25 +37404,25 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
-echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6
--
-- if $PKG_CONFIG --exists "libexif >= 0.6.12 " ; then
++ { echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
++echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "libexif >= 0.6.12 " ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- succeeded=yes
--
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
- echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
-echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6
-- LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12 "`
++ { echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
++echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6; }
+ LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12 "`
- echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
-echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6
--
++ { echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
++echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6; }
+
- echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
-echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6
-- LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12 "`
++ { echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
++echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6; }
+ LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12 "`
- echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
-echo "${ECHO_T}$LIBEXIF_LIBS" >&6
-- else
-- LIBEXIF_CFLAGS=""
-- LIBEXIF_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif >= 0.6.12 "`
--
-- fi
--
--
--
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
--
-- if test $succeeded = yes; then
-- :
-- else
-- { echo "$as_me:$LINENO: WARNING: libexif >= 0.6.12 not found." >&5
--echo "$as_me: WARNING: libexif >= 0.6.12 not found." >&2;}
-- LIBEXIF=yes
-- fi
--
--
--
--
--
--#---------------------------------------------------------
--# libexif detection
--#---------------------------------------------------------
++ { echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
++echo "${ECHO_T}$LIBEXIF_LIBS" >&6; }
+ else
+ LIBEXIF_CFLAGS=""
+ LIBEXIF_LIBS=""
+@@ -34252,11 +37455,10 @@
+ #---------------------------------------------------------
+ # libexif detection
+ #---------------------------------------------------------
-echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
-echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6
-
--
++{ echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
++echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6; }
+
- 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'
--
--
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
--if test "${exif_build+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- extern "C" {
--#include <libexif/exif-loader.h>
--#include <libexif/exif-utils.h>
--}
-+#include <Python.h>
-
- int
- main ()
- {
-
-- ExifLoader *l = exif_loader_new ();
-- exif_loader_write_file (l,"kikoo");
-- return 0;
-+ PySys_SetArgv(1, 0);
-
- ;
- return 0;
++ 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'
+@@ -34296,23 +37498,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -58650,508 +36149,246 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- exif_build=yes
-+ kde_cv_try_link_python_db2=yes
- else
+@@ -34321,14 +37536,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-exif_build=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+kde_cv_try_link_python_db2=no
++ exif_build=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-echo "$as_me:$LINENO: result: $exif_build" >&5
-echo "${ECHO_T}$exif_build" >&6
--if test "$exif_build" = "no"; then
-- LIBEXIF=""
++{ echo "$as_me:$LINENO: result: $exif_build" >&5
++echo "${ECHO_T}$exif_build" >&6; }
+ if test "$exif_build" = "no"; then
+ LIBEXIF=""
fi
--CXXFLAGS="$ac_save_CXXFLAGS"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
+@@ -34373,10 +37589,9 @@
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
--if test -n "$LIBEXIF"; then
-- have_exif_TRUE=
-- have_exif_FALSE='#'
+-# Check whether --with-libwv2 or --without-libwv2 was given.
++# Check whether --with-libwv2 was given.
+ if test "${with_libwv2+set}" = set; then
+- withval="$with_libwv2"
+-
++ withval=$with_libwv2;
+ if test "x$withval" != "xno" ; then
+ if test "x$withval" != "xyes" ; then
+ WV2_DIR=$withval
+@@ -34389,19 +37604,20 @@
else
-- have_exif_TRUE='#'
-- have_exif_FALSE=
--fi
--
--
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ search_for_wv2=yes
--if test -n "$LIBJPEG" -a -n "$LIBEXIF"; then
-- include_jpeg_filter_TRUE=
-- include_jpeg_filter_FALSE='#'
--else
-- include_jpeg_filter_TRUE='#'
-- include_jpeg_filter_FALSE=
- fi
+-fi;
++fi
++
--
--
--if test -n "$LIBTIFF" -a -n "$LIBEXIF"; then
-- include_tiff_filter_TRUE=
-- include_tiff_filter_FALSE='#'
--else
-- include_tiff_filter_TRUE='#'
-- include_tiff_filter_FALSE=
- fi
+ if test $search_for_wv2 != no ; then
+ if test -n "$WV2_DIR" ; then
-
-
--# Check whether --with-libwv2 or --without-libwv2 was given.
--if test "${with_libwv2+set}" = set; then
-- withval="$with_libwv2"
--
-- if test "x$withval" != "xno" ; then
-- if test "x$withval" != "xyes" ; then
-- WV2_DIR=$withval
-- fi
-- search_for_wv2=yes
-- else
-- search_for_wv2=no
-- fi
--
--else
-- search_for_wv2=yes
--
--fi;
--
--if test $search_for_wv2 != no ; then
-- if test -n "$WV2_DIR" ; then
--
- echo "$as_me:$LINENO: checking for wv2-config" >&5
-echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-- if test -n "$WV2_CONFIG"; then
-- kde_cv_path="$WV2_CONFIG";
-- else
-- kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
-+if test "$kde_python_link_found" = no; then
++ { echo "$as_me:$LINENO: checking for wv2-config" >&5
++echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6; }
+ if test -n "$WV2_CONFIG"; then
+ kde_cv_path="$WV2_CONFIG";
+ else
+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
--
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="$WV2_DIR/bin $dirs"
-- else dirs="$dirs $WV2_DIR/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/wv2-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/wv2-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/wv2-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/wv2-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
- fi
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+@@ -34444,29 +37660,29 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { echo "$as_me:$LINENO: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&5
--echo "$as_me: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&2;}
--
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&5
+ echo "$as_me: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&2;}
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- WV2_CONFIG=$kde_cv_path
--
-- fi
--
-- else
--
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ WV2_CONFIG=$kde_cv_path
+
+ fi
+
+ else
+
- echo "$as_me:$LINENO: checking for wv2-config" >&5
-echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-- if test -n "$WV2_CONFIG"; then
-- kde_cv_path="$WV2_CONFIG";
-- else
-- kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for wv2-config" >&5
++echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6; }
+ if test -n "$WV2_CONFIG"; then
+ kde_cv_path="$WV2_CONFIG";
+ else
+ kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/wv2-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/wv2-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/wv2-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/wv2-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -34509,15 +37725,15 @@
+ fi
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- fi
-+#include <Python.h>
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+int
-+main ()
-+{
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { echo "$as_me:$LINENO: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&5
--echo "$as_me: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&2;}
-+ PySys_SetArgv(1, 0);
+ { echo "$as_me:$LINENO: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&5
+ echo "$as_me: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&2;}
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- WV2_CONFIG=$kde_cv_path
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ WV2_CONFIG=$kde_cv_path
-- fi
-+kde_cv_try_link_python_m_and_thread=no
-
-- fi
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--if test -n "$WV2_CONFIG"; then
-- vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 1009
-- then
+ fi
+@@ -34529,7 +37745,8 @@
+ vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test -n "$vers" && test "$vers" -ge 1009
+ then
- LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-- LIBWV2_RPATH=
-- for args in $LIBWV2_LIBS; do
-- case $args in
-- -L*)
-- LIBWV2_RPATH="$LIBWV2_RPATH $args"
-- ;;
-- esac
-- done
-- LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"`
-- LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`"
--
-+fi
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_WV2 1
--_ACEOF
-
-- else
-- { echo "$as_me:$LINENO: WARNING: You need at least version 0.1.9 of libwv2" >&5
--echo "$as_me: WARNING: You need at least version 0.1.9 of libwv2" >&2;}
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
- fi
--fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-
-
-+if test "$kde_python_link_found" = no; then
-
--if test -n "$LIBWV2_LIBS"; then
-- include_wv2_msword_filter_TRUE=
-- include_wv2_msword_filter_FALSE='#'
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
- else
-- include_wv2_msword_filter_TRUE='#'
-- include_wv2_msword_filter_FALSE=
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
- fi
-
--
--
--
--
--
--
--
--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`
++ #LIBWV2_LIBS="`$WV2_CONFIG --libs`"
++ LIBWV2_LIBS="-lwv2"
+ LIBWV2_RPATH=
+ for args in $LIBWV2_LIBS; do
+ case $args in
+@@ -34576,9 +37793,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`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
--#include <$ac_hdr>
-+
-+#include <Python.h>
-
- int
- main ()
- {
--if ((DIR *) 0)
--return 0;
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -34600,23 +37817,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -34616,41 +57987,68 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- eval "$as_ac_Header=yes"
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
+@@ -34625,12 +37855,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-+kde_cv_try_link_python_m_and_thread_and_util=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_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
--_ACEOF
-
--ac_header_dirent=$ac_hdr; break
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
-
--done
--# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
--if test $ac_header_dirent = dirent.h; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -34642,13 +37874,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_func_search_save_LIBS=$LIBS
+ ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34658,17 +58056,14 @@
+@@ -34656,124 +37887,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -59160,188 +36397,174 @@
-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. */
++/* 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. */
-char opendir ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-opendir ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -34694,35 +58089,77 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_search_opendir="none required"
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-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
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ #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 ();
-+#include <Python.h>
-+
+ char opendir ();
int
main ()
{
-opendir ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return opendir ();
;
return 0;
}
-@@ -34748,34 +58185,62 @@
+ _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="-l$ac_lib"
-break
-+ kde_cv_try_link_python_pthread_and_db3=yes
++ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread_and_db3=no
+
fi
++
rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+- conftest$ac_exeext conftest.$ac_ext
- done
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
- fi
--LIBS=$ac_func_search_save_LIBS
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
++ ac_cv_search_opendir=no
fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
else
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_func_search_save_LIBS=$LIBS
+ ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34783,17 +58248,14 @@
+@@ -34781,120 +37987,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -59350,1842 +36573,1269 @@
-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. */
++/* 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. */
-char opendir ();
-+#include <Python.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-opendir ();
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -34819,35 +58281,77 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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_search_opendir="none required"
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+-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
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ #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 ();
-+#include <Python.h>
-+
+ char opendir ();
int
main ()
{
-opendir ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return opendir ();
;
return 0;
}
-@@ -34873,55 +58377,84 @@
+ _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="-l$ac_lib"
-break
-+ kde_cv_try_link_python_pthread_and_dl=yes
++ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread_and_dl=no
+
fi
++
rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+- conftest$ac_exeext conftest.$ac_ext
- done
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
fi
--LIBS=$ac_func_search_save_LIBS
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-+
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
++ ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
-+
-+#include <Python.h>
-
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -34918,23 +38100,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -34934,190 +58467,202 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_header_stdc=yes
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
+@@ -34943,8 +38138,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
-+kde_cv_try_link_python_pthread_and_panel_curses=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_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
--if test $ac_cv_header_stdc = yes; then
-- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <string.h>
-+fi
+
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "memchr" >/dev/null 2>&1; then
-- :
- else
-- ac_cv_header_stdc=no
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
--rm -f conftest*
-
- fi
-
--if test $ac_cv_header_stdc = yes; then
-- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdlib.h>
-
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "free" >/dev/null 2>&1; then
-- :
--else
-- ac_cv_header_stdc=no
--fi
--rm -f conftest*
-
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
- fi
-
--if test $ac_cv_header_stdc = yes; then
-- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-- if test "$cross_compiling" = yes; then
-- :
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+ if test $ac_cv_header_stdc = yes; then
+@@ -35001,6 +38197,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--#include <ctype.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
-- (('a' <= (c) && (c) <= 'i') \
-- || ('j' <= (c) && (c) <= 'r') \
-- || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
-
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+#include <Python.h>
-+
- int
- main ()
- {
-- int i;
-- for (i = 0; i < 256; i++)
-- if (XOR (islower (i), ISLOWER (i))
-- || toupper (i) != TOUPPER (i))
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -35020,18 +38217,27 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
++ return 2;
+ return 0;
}
_ACEOF
--rm -f conftest$ac_exeext
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&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>&5
ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
-- :
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--( exit $ac_status )
--ac_cv_header_stdc=no
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
+@@ -35044,12 +38250,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
-+
fi
-+
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
--if test $ac_cv_header_stdc = yes; then
-+
-+
-+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
-+#define HAVE_PYTHON 1
- _ACEOF
-
- fi
-
-
-
-+else
-+ kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-
--for ac_func in rewinddir popen mkstemp
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+@@ -35064,9 +38272,9 @@
+ for ac_func in rewinddir popen mkstemp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -35092,52 +38300,59 @@
+ #undef $ac_func
+
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
--#endif
-+#include <Python.h>
+ #endif
int
main ()
{
-return f != $ac_func;
-+
-+ PySys_SetArgv(1, 0);
-+
++return $ac_func ();
;
return 0;
}
-@@ -35143,71 +58688,84 @@
+ _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
-- eval "$as_ac_var=yes"
-+ kde_cv_try_link_python_normal=yes
- else
+@@ -35146,13 +38361,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-+kde_cv_try_link_python_normal=no
++ eval "$as_ac_var=no"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "normal" = normal; then
-+ LIBPYTHON="$LIBPYTHON "
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -35162,15 +38379,15 @@
+ done
- fi
--done
-+fi
-
-# Check whether --enable-largefile or --disable-largefile was given.
--if test "${enable_largefile+set}" = set; then
++# Check whether --enable-largefile was given.
+ if test "${enable_largefile+set}" = set; then
- enableval="$enable_largefile"
++ enableval=$enable_largefile;
++fi
-fi;
--if test "$enable_largefile" != no; then
+ if test "$enable_largefile" != no; then
- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
--if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_sys_largefile_CC=no
-- if test "$GCC" != yes; then
-- ac_save_CC=$CC
-- while :; do
+@@ -35178,8 +38395,8 @@
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
++ # IRIX 6.2 and later do not support large files by default,
++ # so use the C compiler's -n32 option if that helps.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
-- /* Check that off_t can represent 2**63 - 1 correctly.
-- We can't simply define LARGE_OFF_T to be 9223372036854775807,
-- since some C++ compilers masquerading as C compilers
-- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-- && LARGE_OFF_T % 2147483647 == 1)
-- ? 1 : -1];
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
+@@ -35203,24 +38420,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 conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
++ 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
-@@ -35220,93 +58778,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-+ kde_cv_try_link_python_m=yes
- else
+@@ -35229,27 +38459,42 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_m=no
+
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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++ CC="$CC -n32"
++ rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sys_largefile_CC=' -n32'; break
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -35258,7 +38503,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m" = normal; then
-+ LIBPYTHON="$LIBPYTHON -lm"
-+ fi
-+
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
fi
--rm -f conftest.err conftest.$ac_objext
-- break
-- done
-- CC=$ac_save_CC
-- rm -f conftest.$ac_ext
-- fi
+
+ rm -f conftest.err conftest.$ac_objext
+ break
+ done
+@@ -35266,14 +38513,14 @@
+ rm -f conftest.$ac_ext
+ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-- if test "$ac_cv_sys_largefile_CC" != no; then
-- CC=$CC$ac_cv_sys_largefile_CC
-- fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
--if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- while :; do
-- ac_cv_sys_file_offset_bits=no
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
-- /* Check that off_t can represent 2**63 - 1 correctly.
-- We can't simply define LARGE_OFF_T to be 9223372036854775807,
-- since some C++ compilers masquerading as C compilers
-- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-- && LARGE_OFF_T % 2147483647 == 1)
-- ? 1 : -1];
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35303,23 +38550,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35319,46 +58874,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-+ kde_cv_try_link_python_pthread=yes
- else
+@@ -35328,7 +38588,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_pthread=no
+
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_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#define _FILE_OFFSET_BITS 64
--#include <sys/types.h>
-- /* Check that off_t can represent 2**63 - 1 correctly.
-- We can't simply define LARGE_OFF_T to be 9223372036854775807,
-- since some C++ compilers masquerading as C compilers
-- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-- && LARGE_OFF_T % 2147483647 == 1)
-- ? 1 : -1];
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35355,23 +38617,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35371,65 +58970,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_sys_file_offset_bits=64; break
-+ kde_cv_try_link_python_tcl=yes
- else
+@@ -35380,13 +38655,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_tcl=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- break
--done
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
--if test "$ac_cv_sys_file_offset_bits" != no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+ if test "$ac_cv_sys_file_offset_bits" != no; then
--cat >>confdefs.h <<_ACEOF
--#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
--_ACEOF
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "tcl" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ltcl"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ cat >>confdefs.h <<_ACEOF
+@@ -35395,8 +38672,8 @@
fi
--rm -f conftest*
+ rm -f conftest*
- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
--if test "${ac_cv_sys_large_files+set}" = set; then
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
++ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- while :; do
-- ac_cv_sys_large_files=no
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h>
-- /* Check that off_t can represent 2**63 - 1 correctly.
-- We can't simply define LARGE_OFF_T to be 9223372036854775807,
-- since some C++ compilers masquerading as C compilers
-- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-- && LARGE_OFF_T % 2147483647 == 1)
-- ? 1 : -1];
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35426,23 +38703,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35442,46 +59066,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-+ kde_cv_try_link_python_db2=yes
- else
+@@ -35451,7 +38741,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_db2=no
+
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_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "db2" = normal; then
-+ LIBPYTHON="$LIBPYTHON -ldb2"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#define _LARGE_FILES 1
--#include <sys/types.h>
-- /* Check that off_t can represent 2**63 - 1 correctly.
-- We can't simply define LARGE_OFF_T to be 9223372036854775807,
-- since some C++ compilers masquerading as C compilers
-- incorrectly reject 9223372036854775807. */
--#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-- && LARGE_OFF_T % 2147483647 == 1)
-- ? 1 : -1];
-+
-+#include <Python.h>
-+
- int
- main ()
- {
-
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35478,23 +38770,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35494,59 +59162,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_sys_large_files=1; break
-+ kde_cv_try_link_python_m_and_thread=yes
- else
+@@ -35503,13 +38808,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_m_and_thread=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- break
--done
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
--if test "$ac_cv_sys_large_files" != no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+ if test "$ac_cv_sys_large_files" != no; then
--cat >>confdefs.h <<_ACEOF
--#define _LARGE_FILES $ac_cv_sys_large_files
--_ACEOF
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
+ cat >>confdefs.h <<_ACEOF
+@@ -35520,8 +38827,8 @@
+ rm -f conftest*
fi
--rm -f conftest*
-+
- fi
-echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
--if test "${ac_cv_sys_largefile_source+set}" = set; then
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
++{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- while :; do
-- ac_cv_sys_largefile_source=no
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+#include <Python.h>
-+
- int
- main ()
- {
--return !fseeko;
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35543,23 +38850,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35559,38 +59258,90 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-+ kde_cv_try_link_python_m_and_thread_and_util=yes
- else
+@@ -35568,7 +38888,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_m_and_thread_and_util=no
+
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_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_util" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#define _LARGEFILE_SOURCE 1
--#include <stdio.h>
-+
-+#include <Python.h>
-+
- int
- main ()
- {
--return !fseeko;
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
+@@ -35587,23 +38909,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
-@@ -35603,52 +59354,83 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_sys_largefile_source=1; break
-+ kde_cv_try_link_python_m_and_thread_and_db3=yes
- else
+@@ -35612,13 +38947,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+kde_cv_try_link_python_m_and_thread_and_db3=no
+
fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- break
--done
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ break
+ done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
--if test "$ac_cv_sys_largefile_source" != no; then
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
+ if test "$ac_cv_sys_largefile_source" != no; then
--cat >>confdefs.h <<_ACEOF
--#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
--_ACEOF
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi
--rm -f conftest*
-
--# 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.
+ cat >>confdefs.h <<_ACEOF
+@@ -35631,8 +38968,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.
-echo "$as_me:$LINENO: checking for fseeko" >&5
-echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
--if test "${ac_cv_func_fseeko+set}" = set; then
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
++{ echo "$as_me:$LINENO: checking for fseeko" >&5
++echo $ECHO_N "checking for fseeko... $ECHO_C" >&6; }
+ if test "${ac_cv_func_fseeko+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+@@ -35652,23 +38989,36 @@
+ }
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+#include <Python.h>
-+
- int
- main ()
- {
--return fseeko && fseeko (stdin, 0, 0);
-+
-+ PySys_SetArgv(1, 0);
-+
- ;
- return 0;
- }
-@@ -35674,82 +59456,77 @@
+ 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
-- ac_cv_func_fseeko=yes
-+ kde_cv_try_link_python_pthread_and_db3=yes
- else
+@@ -35677,13 +39027,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_fseeko=no
-+kde_cv_try_link_python_pthread_and_db3=no
++ ac_cv_func_fseeko=no
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
-echo "${ECHO_T}$ac_cv_func_fseeko" >&6
--if test $ac_cv_func_fseeko = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
++echo "${ECHO_T}$ac_cv_func_fseeko" >&6; }
+ if test $ac_cv_func_fseeko = yes; then
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FSEEKO 1
--_ACEOF
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_db3" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+ fi
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi
-
-+fi
-
--for ac_func in fseek64
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ cat >>confdefs.h <<\_ACEOF
+@@ -35696,9 +39047,9 @@
+ for ac_func in fseek64
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -35724,52 +39075,59 @@
+ #undef $ac_func
+
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
--#endif
-+#include <Python.h>
+ #endif
int
main ()
{
-return f != $ac_func;
-+
-+ PySys_SetArgv(1, 0);
-+
++return $ac_func ();
;
return 0;
}
-@@ -35775,82 +59552,77 @@
+ _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
-- eval "$as_ac_var=yes"
-+ kde_cv_try_link_python_m_and_thread_and_db=yes
- else
+@@ -35778,13 +39136,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-+kde_cv_try_link_python_m_and_thread_and_db=no
++ eval "$as_ac_var=no"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-
- fi
--done
-
-
--for ac_func in ftell64
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -35797,9 +39157,9 @@
+ for ac_func in ftell64
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+ fi
-+
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -35825,52 +39185,59 @@
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+fi
+ #undef $ac_func
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
-
--#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
++/* 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
+ #endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
--#endif
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <Python.h>
+ #endif
int
main ()
{
-return f != $ac_func;
-+
-+ PySys_SetArgv(1, 0);
-+
++return $ac_func ();
;
return 0;
}
-@@ -35876,217 +59648,158 @@
+ _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
-- eval "$as_ac_var=yes"
-+ kde_cv_try_link_python_pthread_and_dl=yes
- else
+@@ -35879,13 +39246,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-+kde_cv_try_link_python_pthread_and_dl=no
++ eval "$as_ac_var=no"
+ fi
+
- fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -35900,10 +39269,9 @@
- fi
--done
--
--
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_dl" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+ fi
-
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
-+fi
-
-+fi
-
-- kde_safe_cppflags=$CPPFLAGS
-- CPPFLAGS="$CPPFLAGS $all_includes"
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
- 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'
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "pthread_and_panel_curses" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+fi
-
--for ac_header in paper.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ 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'
+@@ -35916,18 +39284,19 @@
+ for ac_header in paper.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
else
-- # Is the header compilable?
+ # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+ PySys_SetArgv(1, 0);
-+
-+ ;
-+ return 0;
-+}
+@@ -35938,23 +39307,36 @@
+ #include <$ac_header>
_ACEOF
--rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+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_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
@@ -61193,99 +37843,85 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_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'
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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_header_compiler=yes
-+ kde_cv_try_link_python_pthread_and_panel_curses=yes
- else
+@@ -35963,15 +39345,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+kde_cv_try_link_python_pthread_and_panel_curses=no
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--# Is the header present?
+ # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -35980,8 +39363,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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
- fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
++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
+@@ -36005,9 +39393,10 @@
-- ac_header_preproc=no
+ ac_header_preproc=no
fi
--rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--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;}
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -36031,25 +39420,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -61294,4188 +37930,6605 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
++
+ ;;
+ esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "pthread_and_panel_curses" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-+ fi
-+
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-
- fi
-
--done
-
-- CPPFLAGS=$kde_safe_cppflags
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+if test "$kde_python_link_found" = no; then
-
-+if test "m_and_thread_and_db_special" = normal; then
-+ echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-
-- kde_save_LDFLAGS="$LDFLAGS"
-- kde_save_LIBS="$LIBS"
-- LDFLAGS="$LDFLAGS $all_libraries"
-- case $host_os in
-- aix*) LDFLAGS="-brtl $LDFLAGS"
-- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-- ;;
-- esac
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -36078,8 +39461,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
- echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
-echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6
--if test "${ac_cv_lib_paper_paperinit+set}" = set; then
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
++ { echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
++echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_paper_paperinit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpaper $LIBS"
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -36094,17 +59807,14 @@
+@@ -36092,39 +39475,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
++/* 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 paperinit ();
-+#include <Python.h>
-+
+ char paperinit ();
int
main ()
{
-paperinit ();
-+
-+ PySys_SetArgv(1, 0);
-+
++return paperinit ();
;
return 0;
}
-@@ -36130,800 +59840,996 @@
+ _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
-- ac_cv_lib_paper_paperinit=yes
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
- else
+@@ -36133,14 +39529,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_paper_paperinit=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_lib_paper_paperinit=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
-echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6
--if test $ac_cv_lib_paper_paperinit = yes; then
-- LIBPAPER="-lpaper"
--fi
--
-- LDFLAGS="$kde_save_LDFLAGS"
-- LIBS="$kde_save_LIBS"
--
--
--
--
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
++echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6; }
+ if test $ac_cv_lib_paper_paperinit = yes; then
+ LIBPAPER="-lpaper"
+ fi
+@@ -36151,14 +39548,14 @@
+
+
+
- echo "$as_me:$LINENO: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-- if test -n "$PKGCONFIG"; then
-- kde_cv_path="$PKGCONFIG";
-- else
-- kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for pkg-config" >&5
++echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
+ if test -n "$PKGCONFIG"; then
+ kde_cv_path="$PKGCONFIG";
+ else
+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/pkg-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/pkg-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -36201,15 +39598,15 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
--echo "$as_me: WARNING: Could not find pkg-config" >&2;}
--
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
+ echo "$as_me: WARNING: Could not find pkg-config" >&2;}
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- PKGCONFIG=$kde_cv_path
--
-- fi
--
--
--if test -n "$PKGCONFIG"; then
-- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
-- if test -n "$vers"
-- then
-- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
-- LIBWPD_RPATH=
-- for args in $LIBWPD_LIBS; do
-- case $args in
-- -L*)
-- LIBWPD_RPATH="$LIBWPD_RPATH $args"
-- ;;
-- esac
-- done
-- LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
-- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
--
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_WPD 1
--_ACEOF
--
-- fi
--fi
--
--
--
--
--
--
--
--
--if test -n "$LIBWPD_LIBS"; then
-- include_wpd_filter_TRUE=
-- include_wpd_filter_FALSE='#'
--else
-- include_wpd_filter_TRUE='#'
-- include_wpd_filter_FALSE=
--fi
--
--
--
--
--
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PKGCONFIG=$kde_cv_path
+
+ fi
+@@ -36258,14 +39655,14 @@
+
+
+
- echo "$as_me:$LINENO: checking for xml2-config" >&5
-echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
-- if test -n "$XML_CONFIG"; then
-- kde_cv_path="$XML_CONFIG";
-- else
-- kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for xml2-config" >&5
++echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
+ if test -n "$XML_CONFIG"; then
+ kde_cv_path="$XML_CONFIG";
+ else
+ kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/xml2-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/xml2-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/xml2-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/xml2-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -36308,16 +39705,16 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
--echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-- HELP_SUBDIR=
--
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+ echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+ HELP_SUBDIR=
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- XML_CONFIG=$kde_cv_path
--
-- fi
--
--
--if test -n "$XML_CONFIG"; then
-- vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 2004008
-- then
-- LIBXML_LIBS="`$XML_CONFIG --libs`"
-- LIBXML_RPATH=
-- for args in $LIBXML_LIBS; do
-- case $args in
-- -L*)
-- LIBXML_RPATH="$LIBXML_RPATH $args"
-- ;;
-- esac
-- done
-- LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"`
-- LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
--
--
-- echo "$as_me:$LINENO: checking for xmllint" >&5
--echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-- if test -n "$XMLLINT"; then
-- kde_cv_path="$XMLLINT";
-- else
-- kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
--
-- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/xmllint"; then
-- if test -n ""
-- then
-- evalstr="$dir/xmllint 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/xmllint"
-- break
-- fi
-- else
-- kde_cv_path="$dir/xmllint"
-- break
-- fi
-- fi
-- done
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XML_CONFIG=$kde_cv_path
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
+ fi
+@@ -36340,14 +39737,14 @@
+ LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
- fi
+- echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+ if test -n "$XMLLINT"; then
+ kde_cv_path="$XMLLINT";
+ else
+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-+fi
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+@@ -36390,12 +39787,12 @@
+ fi
-- fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- XMLLINT=""
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ XMLLINT=""
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- XMLLINT=$kde_cv_path
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XMLLINT=$kde_cv_path
-- fi
-
-
--cat >>confdefs.h <<_ACEOF
--#define XMLLINT "$XMLLINT"
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
- _ACEOF
-
-- else
-- { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
--echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
-- HELP_SUBDIR=
-- fi
+ fi
+@@ -36413,14 +39810,14 @@
fi
- echo "$as_me:$LINENO: checking for xslt-config" >&5
-echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
-- if test -n "$XSLT_CONFIG"; then
-- kde_cv_path="$XSLT_CONFIG";
-- else
-- kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
++ { echo "$as_me:$LINENO: checking for xslt-config" >&5
++echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
+ if test -n "$XSLT_CONFIG"; then
+ kde_cv_path="$XSLT_CONFIG";
+ else
+ kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+
-+
-+ kde_save_LDFLAGS="$LDFLAGS"
-+ kde_save_LIBS="$LIBS"
-+ LDFLAGS="$LDFLAGS $all_libraries"
-+ case $host_os in
-+ aix*) LDFLAGS="-brtl $LDFLAGS"
-+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+ ;;
-+ esac
-+ echo "$as_me:$LINENO: checking for XOpenDisplay in -lXi" >&5
-+echo $ECHO_N "checking for XOpenDisplay in -lXi... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xi_XOpenDisplay+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXi $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
-+/* 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 XOpenDisplay ();
-+int
-+main ()
-+{
-+XOpenDisplay ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_Xi_XOpenDisplay=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+@@ -36463,16 +39860,16 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/xslt-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/xslt-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/xslt-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/xslt-config"
-- break
-- fi
-- fi
-- done
-+ac_cv_lib_Xi_XOpenDisplay=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xi_XOpenDisplay" >&6
-+if test $ac_cv_lib_Xi_XOpenDisplay = yes; then
-+ LIB_XINPUTEXT="-lXi"
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_XINPUTEXT 1
-+_ACEOF
-
-
- fi
-
-+ LDFLAGS="$kde_save_LDFLAGS"
-+ LIBS="$kde_save_LIBS"
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+# Check for lcms
-+echo "$as_me:$LINENO: checking for lcms >= 1.12" >&5
-+echo $ECHO_N "checking for lcms >= 1.12... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
--echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-- HELP_SUBDIR=
-+have_lcms_header='no'
+ { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+ echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+ HELP_SUBDIR=
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- XSLT_CONFIG=$kde_cv_path
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XSLT_CONFIG=$kde_cv_path
-- fi
+ fi
+@@ -36526,14 +39923,14 @@
-+ 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
--if test -n "$XSLT_CONFIG"; then
-- vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 1000007; then
-- LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-- LIBXSLT_RPATH=
-- for args in $LIBXSLT_LIBS; do
-- case $args in
-- -L*)
-- LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-- ;;
-- esac
-- done
-- LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"`
-- LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-- else
-- { echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
--echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
-- HELP_SUBDIR=
-- fi
-+
-+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
-+if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
-+echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if test ! "$USE_RPATH" = "yes"; then
-- LIBXSLT_RPATH=
-- LIBXML_RPATH=
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
-+echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: lcms/lcms.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&5
-+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;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
-+if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_lcms_lcms_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
-
-+fi
-+if test $ac_cv_header_lcms_lcms_h = yes; then
-+ have_lcms_header='yes'
-+fi
-
-
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+ CPPFLAGS=$kde_safe_cppflags
-
-+if test "$have_lcms_header" = 'yes'
-+then
-
-+cat >>confdefs.h <<\_ACEOF
-+#define LCMS_HEADER <lcms/lcms.h>
-+_ACEOF
-
-
-+ echo "#include <lcms/lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
-
--if test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS"; then
-- include_XSLTFILTERS_TRUE=
-- include_XSLTFILTERS_FALSE='#'
- else
-- include_XSLTFILTERS_TRUE='#'
-- include_XSLTFILTERS_FALSE=
--fi
-+ # Alternative! Debian does it this way...
-+
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-
-
-+ 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'
-
- echo "$as_me:$LINENO: checking for freetype-config" >&5
-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
-- if test -n "$FREETYPE_CONFIG"; then
-- kde_cv_path="$FREETYPE_CONFIG";
-- else
-- kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
++ { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+ if test -n "$FREETYPE_CONFIG"; then
+ kde_cv_path="$FREETYPE_CONFIG";
+ else
+ kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ if test "${ac_cv_header_lcms_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for lcms.h" >&5
-+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
-+if test "${ac_cv_header_lcms_h+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking lcms.h usability" >&5
-+echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <lcms.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/freetype-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/freetype-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/freetype-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/freetype-config"
-- break
-- fi
-- fi
-- done
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
+@@ -36576,15 +39973,15 @@
+ fi
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+# Is the header present?
-+echo "$as_me:$LINENO: checking lcms.h presence" >&5
-+echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: lcms.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: lcms.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: lcms.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: lcms.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the preprocessor's result" >&5
-+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;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for lcms.h" >&5
-+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
-+if test "${ac_cv_header_lcms_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_lcms_h=$ac_header_preproc
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
-
-+fi
-+if test $ac_cv_header_lcms_h = yes; then
-+ have_lcms_header='yes'
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-- fi
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+ CPPFLAGS=$kde_safe_cppflags
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
--echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
+ { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
+ echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- FREETYPE_CONFIG=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FREETYPE_CONFIG=$kde_cv_path
-- fi
-+cat >>confdefs.h <<\_ACEOF
-+#define LCMS_HEADER <lcms.h>
-+_ACEOF
+ fi
+@@ -36617,14 +40014,14 @@
--if test -n "$FREETYPE_CONFIG"; then
-- vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 5000000
-- then
-- LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-- LIBFREETYPE_RPATH=
-- for args in $LIBFREETYPE_LIBS; do
-- case $args in
-- -L*)
-- LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-- ;;
-- esac
-- done
-- LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"`
-- LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-- 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;}
-- fi
-+ echo "#include <lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
- fi
-
-+ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext -llcms 1>&5'
-
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ HAVELCMS="yes"
-+ LCMS_LIBS="-llcms"
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ HAVELCMS="no"
-+ LCMS_LIBS=""
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
-+fi
-
-
-
-+# Check if the 1.14 version of lcms is detected
-+if test ! "$LCMS_LIBS" = ""
-+then
-
- echo "$as_me:$LINENO: checking for libart2-config" >&5
-echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
-- if test -n "$LIBART_CONFIG"; then
-- kde_cv_path="$LIBART_CONFIG";
-- else
-- kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
++ { echo "$as_me:$LINENO: checking for libart2-config" >&5
++echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; }
+ if test -n "$LIBART_CONFIG"; then
+ kde_cv_path="$LIBART_CONFIG";
+ else
+ kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$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
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+@@ -36667,15 +40064,15 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/libart2-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/libart2-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/libart2-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/libart2-config"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include LCMS_HEADER
-+ #if LCMS_VERSION == 114
-+ #error lcms 1.14 detected
-+ #endif
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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
-+ lcms_version_114='no'
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+lcms_version_114='yes'
- fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+fi
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
--echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
-+# IM 6.1.3 changed the number of arguments to GetMagickInfoList
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
+ echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- LIBART_CONFIG=$kde_cv_path
-+echo "$as_me:$LINENO: checking if GetMagickInfoList has only 2 arguments" >&5
-+echo $ECHO_N "checking if GetMagickInfoList has only 2 arguments... $ECHO_C" >&6
-+CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags
-+CPPFLAGS="$LIBMAGICK_CPPFLAGS"
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ LIBART_CONFIG=$kde_cv_path
-- fi
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdio.h>
-+ #if HAVE_SYS_TYPES_H
-+ #include <sys/types.h>
-+ #endif
-+ #include "magick/api.h"
-+int
-+main ()
-+{
-+const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ magick_info_list='yes'
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+@@ -36715,14 +40112,14 @@
-+magick_info_list='no'
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Check for fontconfig
--if test -n "$LIBART_CONFIG"; then
-- vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 2003008
-- then
-- LIBART_LIBS="`$LIBART_CONFIG --libs`"
-- LIBART_RPATH=
-- for args in $LIBART_LIBS; do
-- case $args in
-- -L*)
-- LIBART_RPATH="$LIBART_RPATH $args"
-- ;;
-- esac
-- done
-- LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"`
-- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags
-
-+if test "$magick_info_list" = 'yes'; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBART 1
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OLD_GETMAGICKINFOLIST 1
- _ACEOF
-
-- else
-- { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
--echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
-- fi
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-+# Check for kunittest
-+echo "$as_me:$LINENO: checking for kunittest" >&5
-+echo $ECHO_N "checking for kunittest... $ECHO_C" >&6
-
-+have_kunittest_header="no"
-
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-
-
-+ 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
-
--# Check for fontconfig
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
- echo "$as_me:$LINENO: checking for fontconfig-config" >&5
-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
-- if test -n "$FONTCONFIG_CONFIG"; then
-- kde_cv_path="$FONTCONFIG_CONFIG";
-- else
-- kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
++ { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
++echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
+ if test -n "$FONTCONFIG_CONFIG"; then
+ kde_cv_path="$FONTCONFIG_CONFIG";
+ else
+ kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
-+echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
-+if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking kunittest/tester.h usability" >&5
-+echo $ECHO_N "checking kunittest/tester.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <kunittest/tester.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/fontconfig-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/fontconfig-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/fontconfig-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/fontconfig-config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
-+ac_header_compiler=no
- fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
+@@ -36765,18 +40162,18 @@
+ fi
-+# Is the header present?
-+echo "$as_me:$LINENO: checking kunittest/tester.h presence" >&5
-+echo $ECHO_N "checking kunittest/tester.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <kunittest/tester.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
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
--
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+
- echo "$as_me:$LINENO: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-- if test -n "$PKGCONFIG"; then
-- kde_cv_path="$PKGCONFIG";
-- else
-- kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
++ { echo "$as_me:$LINENO: checking for pkg-config" >&5
++echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
+ if test -n "$PKGCONFIG"; then
+ kde_cv_path="$PKGCONFIG";
+ else
+ kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
-+echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
-+if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-+ ac_cv_header_kunittest_tester_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin"
-- fi
-- IFS=$kde_save_IFS
-+fi
-+if test $ac_cv_header_kunittest_tester_h = yes; then
-+ have_kunittest_header="yes"
-+fi
+@@ -36819,23 +40216,23 @@
+ fi
-- for dir in $dirs; do
-- if test -x "$dir/pkg-config"; then
-- if test -n ""
-- then
-- evalstr="$dir/pkg-config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/pkg-config"
-- break
-- fi
-- fi
-- done
-
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ CPPFLAGS=$kde_safe_cppflags
-+
-
-
-+if test "$have_kunittest_header" = "yes"; then
-+ include_kunittest_tests_TRUE=
-+ include_kunittest_tests_FALSE='#'
-+else
-+ include_kunittest_tests_TRUE='#'
-+ include_kunittest_tests_FALSE=
- fi
-
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
-+# --- OpenGL check ---
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
--echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
+ { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
+ echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- PKGCONFIG=$kde_cv_path
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PKGCONFIG=$kde_cv_path
-- fi
+ fi
-+# Check whether --with-gl or --without-gl was given.
-+if test "${with_gl+set}" = set; then
-+ withval="$with_gl"
-+ gl_test=$withval
-+else
-+ gl_test="yes"
-+fi;
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+ # GL and Qt Embedded is a no-go for now.
-+ ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+ ac_cv_have_gl=no
-+ else
-+ echo "$as_me:$LINENO: checking for GL" >&5
-+echo $ECHO_N "checking for GL... $ECHO_C" >&6
-+ if test "${ac_cv_have_gl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- FONTCONFIG_CONFIG=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ FONTCONFIG_CONFIG=$kde_cv_path
-- fi
+ fi
+@@ -36908,8 +40305,8 @@
-+ 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
--if test -n "$PKGCONFIG"; then
-- vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 1000001
-- then
-- LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-- LIBFONTCONFIG_RPATH=
-- for args in $LIBFONTCONFIG_LIBS; do
-- case $args in
-- -L*)
-- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-- ;;
-- esac
-- done
-- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-- LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_FONTCONFIG 1
-+ ac_save_ldflags=$LDFLAGS
-+ ac_save_cxxflags=$CXXFLAGS
-+ ac_save_libs=$LIBS
-+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+ LIBS="$LIBS -lGL -lGLU"
-+ test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+ LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+ CXXFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
- _ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-
-- fi
--fi
--
--if test -n "$FONTCONFIG_CONFIG"; then
-- vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 1000001
-- then
-- LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-- LIBFONTCONFIG_RPATH=
-- for args in $LIBFONTCONFIG_LIBS; do
-- case $args in
-- -L*)
-- LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-- ;;
-- esac
-- done
-- LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-- LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
--
-+int
-+main ()
-+{
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_FONTCONFIG 1
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.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_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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_have_gl="yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- fi
-+ac_cv_have_gl="no"
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+ LDFLAGS=$ac_save_ldflags
-+ CXXFLAGS=$ac_save_cxxflags
-+ LIBS=$ac_save_libs
-
--
--
--
--if test -z "$LIBART_LIBS"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
- fi
-
--if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
-+ if test "$ac_cv_have_gl" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ GL_LDFLAGS=""
-+ GLINC=""
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_KARBONTEXT 1
-+ else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
- _ACEOF
-
--fi
-+ if test "$GL_LDFLAGS" = ""; then
-+ GLLIB='-lGLU -lGL $(LIB_X11)'
-+ else
-+ GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+ fi
-+ if test "$GL_INCLUDE" = ""; then
-+ GLINC=""
-+ else
-+ GLINC="-I$GL_INCLUDE"
-+ fi
-+ echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
-+echo "${ECHO_T}$ac_cv_have_gl" >&6
-
-+ fi
-+ fi
-
-
-
-echo "$as_me:$LINENO: checking for Readline library" >&5
-echo $ECHO_N "checking for Readline library... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Readline library" >&5
++echo $ECHO_N "checking for Readline library... $ECHO_C" >&6; }
--kexi_cv_lib_readline=no
--ac_save_LIBS="$LIBS"
--# Note: $LIBCURSES is permitted to be empty.
--for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
--do
-- LIBS="$ac_save_LIBS $LIBREADLINE"
-- if test "$cross_compiling" = yes; then
-+# --- End of OpenGL check ---
+ kexi_cv_lib_readline=no
+ ac_save_LIBS="$LIBS"
+@@ -36947,13 +40344,22 @@
-- # action if cross compiling
-- kexi_cv_lib_readline=no
-+# Check for powf.
-
-+echo "$as_me:$LINENO: checking for powf" >&5
-+echo $ECHO_N "checking for powf... $ECHO_C" >&6
-+if test "${ac_cv_func_powf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -36931,844 +60837,1227 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define powf to an innocuous variant, in case <limits.h> declares powf.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define powf innocuous_powf
-
-- /* program */
--#include <stdio.h>
--#include <stdlib.h>
--#include <readline/readline.h>
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char powf (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-
--main(int argc, char **argv)
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef powf
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
- {
-- /* Note: don't actually call readline, since it may block;
-- * We just want to see if it (dynamic) linked in okay.
-- */
-- if (argc == 0) /* never true */
-- readline(0);
-- exit(0);
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char powf ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_powf) || defined (__stub___powf)
-+choke me
-+#else
-+char (*f) () = powf;
-+#endif
-+#ifdef __cplusplus
- }
-+#endif
-
-+int
-+main ()
-+{
-+return f != powf;
-+ ;
-+ return 0;
-+}
_ACEOF
--rm -f conftest$ac_exeext
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&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>&5
ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
--
-- # action if true
-- kexi_cv_lib_readline=yes
--
-+ ac_cv_func_powf=yes
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -36972,9 +40378,11 @@
+ kexi_cv_lib_readline=no
--( exit $ac_status )
-+ac_cv_func_powf=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_powf" >&5
-+echo "${ECHO_T}$ac_cv_func_powf" >&6
-+if test $ac_cv_func_powf = yes; then
-+ have_powf="yes"
-+else
-+ echo "$as_me:$LINENO: checking for powf in -lm" >&5
-+echo $ECHO_N "checking for powf in -lm... $ECHO_C" >&6
-+if test "${ac_cv_lib_m_powf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- # action if false
-- kexi_cv_lib_readline=no
-+/* 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 powf ();
-+int
-+main ()
-+{
-+powf ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_m_powf=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_lib_m_powf=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_m_powf" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_powf" >&6
-+if test $ac_cv_lib_m_powf = yes; then
-+ have_powf="yes"
-+else
-+ have_powf="no"
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-- if test "$kexi_cv_lib_readline" = yes ; then break ; fi
--done
--# restore LIBS
--LIBS="$ac_save_LIBS"
-+fi
++
++
+ if test "$kexi_cv_lib_readline" = yes ; then break ; fi
+ done
+ # restore LIBS
+@@ -36982,11 +40390,11 @@
--if test "$kexi_cv_lib_readline" = no ; then
-- LIBREADLINE=""
+ if test "$kexi_cv_lib_readline" = no ; then
+ LIBREADLINE=""
- echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
-echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6
--else
++ { echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
++echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6; }
+ else
- echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
-echo "${ECHO_T}$LIBREADLINE" >&6
-+
-+if test "$have_powf" = 'yes'; then
++ { echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
++echo "${ECHO_T}$LIBREADLINE" >&6; }
cat >>confdefs.h <<\_ACEOF
--#define HAVE_READLINE 1
-+#define HAVE_POWF 1
- _ACEOF
+ #define HAVE_READLINE 1
+@@ -37016,13 +40424,13 @@
- fi
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-+
-+
-+ 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
-
--if test "$kexi_cv_lib_readline" = "yes"; then
-- have_readline_TRUE=
-- have_readline_FALSE='#'
--else
-- have_readline_TRUE='#'
-- have_readline_FALSE=
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+
-+ if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
-+echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
-+if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h usability" >&5
-+echo $ECHO_N "checking kjsembed/jsproxy_imp.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <kjsembed/jsproxy_imp.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-
-+# Is the header present?
-+echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h presence" >&5
-+echo $ECHO_N "checking kjsembed/jsproxy_imp.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <kjsembed/jsproxy_imp.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
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
-+echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
-+if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_kjsembed_jsproxy_imp_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
-
--#KEXI_VERSION=
--LIB_KEXI_KMDI='-lkmdi'
-+fi
-+if test $ac_cv_header_kjsembed_jsproxy_imp_h = yes; then
-+ have_kjsembed=yes
-+else
-+ have_kjsembed=no
-+fi
-
--LIB_KEXI_KMDI_INCLUDES=''
-
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+ CPPFLAGS=$kde_safe_cppflags
-
-
-# Check whether --enable-mysql or --disable-mysql was given.
--if test "${enable_mysql+set}" = set; then
++# Check whether --enable-mysql was given.
+ if test "${enable_mysql+set}" = set; then
- enableval="$enable_mysql"
- mysql_plugin=$enableval
--else
-- mysql_plugin=yes
++ enableval=$enable_mysql; mysql_plugin=$enableval
+ else
+ mysql_plugin=yes
-fi;
++fi
++
--if test "x$mysql_plugin" = "xyes"; then
-- compile_mysql_plugin="yes"
-+if test x$have_kjsembed = xyes; then
-+ use_kjsembed_TRUE=
-+ use_kjsembed_FALSE='#'
- else
-- compile_mysql_plugin="no"
-+ use_kjsembed_TRUE='#'
-+ use_kjsembed_FALSE=
+ if test "x$mysql_plugin" = "xyes"; then
+ compile_mysql_plugin="yes"
+@@ -37031,37 +40439,37 @@
fi
-# Check whether --with-mysql_includes or --without-mysql_includes was given.
--if test "${with_mysql_includes+set}" = set; then
++# Check whether --with-mysql_includes was given.
+ if test "${with_mysql_includes+set}" = set; then
- withval="$with_mysql_includes"
-+echo "$as_me:$LINENO: checking whether round is declared" >&5
-+echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6
-+if test "${ac_cv_have_decl_round+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. */
-+#include <math.h>
+-
++ withval=$with_mysql_includes;
+ ac_mysql_incdir=$withval
-- ac_mysql_incdir=$withval
-+int
-+main ()
-+{
-+#ifndef round
-+ char *p = (char *) round;
-+#endif
+ else
+ ac_mysql_incdir=
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_have_decl_round=yes
- else
-- ac_mysql_incdir=
--
-fi;
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_have_decl_round=no
+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_round" >&6
-+if test $ac_cv_have_decl_round = yes; then
+
-# Check whether --with-mysql_libraries or --without-mysql_libraries was given.
-if test "${with_mysql_libraries+set}" = set; then
- withval="$with_mysql_libraries"
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ROUND 1
-+_ACEOF
-- ac_mysql_libdir=$withval
++# Check whether --with-mysql_libraries was given.
++if test "${with_mysql_libraries+set}" = set; then
++ withval=$with_mysql_libraries;
+ ac_mysql_libdir=$withval
else
-- ac_mysql_libdir=
--
+ ac_mysql_libdir=
+
-fi;
--
--
++fi
++
+
+
-echo "$as_me:$LINENO: checking for MySQL" >&5
-echo $ECHO_N "checking for MySQL... $ECHO_C" >&6
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ROUND 0
-+_ACEOF
++{ echo "$as_me:$LINENO: checking for MySQL" >&5
++echo $ECHO_N "checking for MySQL... $ECHO_C" >&6; }
--if test "$compile_mysql_plugin" = "yes"; then
-- if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
+ if test "$compile_mysql_plugin" = "yes"; then
+ if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
- echo "$as_me:$LINENO: checking for MySQL headers" >&5
-echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6
-- mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
++ { echo "$as_me:$LINENO: checking for MySQL headers" >&5
++echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6; }
+ mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
--mysql_incdir=NO
--for i in $mysql_incdirs;
--do
-- for j in mysql/mysql.h;
-- do
-- echo "configure: 37074: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- mysql_incdir=$i
-- break 2
-- fi
-- done
--done
-+fi
+ mysql_incdir=NO
+@@ -37069,7 +40477,7 @@
+ do
+ for j in mysql/mysql.h;
+ do
+- echo "configure: 37072: $i/$j" >&5
++ echo "configure: 40480: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ mysql_incdir=$i
+@@ -37080,17 +40488,17 @@
-- if test -r $mysql_incdir/mysql/mysql.h; then
-- MYSQL_INC=$mysql_incdir
+ if test -r $mysql_incdir/mysql/mysql.h; then
+ MYSQL_INC=$mysql_incdir
- echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
-echo "${ECHO_T}$MYSQL_INC" >&6
++ { echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
++echo "${ECHO_T}$MYSQL_INC" >&6; }
-- else
-- compile_mysql_plugin="no"
+ else
+ compile_mysql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
- echo "$as_me:$LINENO: checking for MySQL libraries" >&5
-echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6
-- mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
++ { echo "$as_me:$LINENO: checking for MySQL libraries" >&5
++echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6; }
+ mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--mysql_libdir=NO
--for i in $mysql_libdirs;
-+for ac_header in ieeefp.h
+ mysql_libdir=NO
+@@ -37098,7 +40506,7 @@
do
-- for j in mysql/libmysqlclient.so;
-- do
-- echo "configure: 37103: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- mysql_libdir=$i
-- break 2
-- fi
-- done
--done
--
-- if test -r $mysql_libdir/mysql/libmysqlclient.so; then
-- MYSQL_LIBS=$mysql_libdir
+ for j in mysql/libmysqlclient.so;
+ do
+- echo "configure: 37101: $i/$j" >&5
++ echo "configure: 40509: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ mysql_libdir=$i
+@@ -37109,24 +40517,24 @@
+
+ if test -r $mysql_libdir/mysql/libmysqlclient.so; then
+ MYSQL_LIBS=$mysql_libdir
- echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
-echo "${ECHO_T}$MYSQL_LIBS" >&6
--
-- else
-- compile_mysql_plugin="no"
++ { echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
++echo "${ECHO_T}$MYSQL_LIBS" >&6; }
+
+ else
+ compile_mysql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
-- else
--
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
+ else
+
- echo "$as_me:$LINENO: checking for mysql_config" >&5
-echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6
-- if test -n "$MYSQL_CONFIG"; then
-- kde_cv_path="$MYSQL_CONFIG";
-- else
-- kde_cache=`echo mysql_config | sed 'y%./+-%__p_%'`
--
++ { echo "$as_me:$LINENO: checking for mysql_config" >&5
++echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6; }
+ if test -n "$MYSQL_CONFIG"; then
+ kde_cv_path="$MYSQL_CONFIG";
+ else
+ kde_cache=`echo mysql_config | sed 'y%./+-%__p_%'`
+
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/mysql_config"; then
-- if test -n ""
-- then
-- evalstr="$dir/mysql_config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/mysql_config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/mysql_config"
-- break
-- fi
-- fi
-- done
--
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
-+ac_header_compiler=no
- fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
+@@ -37169,15 +40577,15 @@
+ fi
--
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
-- fi
--
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
--
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- MYSQL_CONFIG=$kde_cv_path
--
-- fi
--
--
-- if test -n "$MYSQL_CONFIG"; then
-- mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1`
-- mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
-- MYSQL_INC=$mysql_incdir
-- MYSQL_LIBS=$mysql_libdir
--
--
-- compile_mypsql_plugin="yes"
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MYSQL_CONFIG=$kde_cv_path
+
+ fi
+@@ -37191,8 +40599,8 @@
+
+
+ compile_mypsql_plugin="yes"
- echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
-echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6
-- else
-- compile_mysql_plugin="no"
-- fi
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
- fi
- else
-- { echo "$as_me:$LINENO: Not attempting to configure MySQL as requested" >&5
--echo "$as_me: Not attempting to configure MySQL as requested" >&6;}
-+ ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
++echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6; }
+ else
+ compile_mysql_plugin="no"
+ fi
+@@ -37215,13 +40623,13 @@
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
--
--if test "$compile_mysql_plugin" = "yes"; then
-- compile_mysql_plugin_TRUE=
-- compile_mysql_plugin_FALSE='#'
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- compile_mysql_plugin_TRUE='#'
-- compile_mysql_plugin_FALSE=
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
--
--
-# Check whether --enable-pgsql or --disable-pgsql was given.
--if test "${enable_pgsql+set}" = set; then
++# Check whether --enable-pgsql was given.
+ if test "${enable_pgsql+set}" = set; then
- enableval="$enable_pgsql"
- pgsql_plugin=$enableval
--else
-- pgsql_plugin=yes
++ enableval=$enable_pgsql; pgsql_plugin=$enableval
+ else
+ pgsql_plugin=yes
-fi;
--
--if test "x$pgsql_plugin" = "xyes"; then
-- compile_pgsql_plugin="yes"
--else
-- compile_pgsql_plugin="no"
++fi
++
+
+ if test "x$pgsql_plugin" = "xyes"; then
+ compile_pgsql_plugin="yes"
+@@ -37230,35 +40638,35 @@
fi
-+done
-# Check whether --with-pgsql-includes or --without-pgsql-includes was given.
--if test "${with_pgsql_includes+set}" = set; then
++# Check whether --with-pgsql-includes was given.
+ if test "${with_pgsql_includes+set}" = set; then
- withval="$with_pgsql_includes"
+-
++ withval=$with_pgsql_includes;
+ ac_pgsql_incdir=$withval
-- ac_pgsql_incdir=$withval
-
-+for ac_func in fabsl
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_pgsql_incdir=
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
+ ac_pgsql_incdir=
-fi;
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
++fi
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-# Check whether --with-pgsql-libraries or --without-pgsql-libraries was given.
-if test "${with_pgsql_libraries+set}" = set; then
- withval="$with_pgsql_libraries"
-+#undef $ac_func
-- ac_pgsql_libdir=$withval
-+/* 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 $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
++# Check whether --with-pgsql-libraries was given.
++if test "${with_pgsql_libraries+set}" = set; then
++ withval=$with_pgsql_libraries;
+ ac_pgsql_libdir=$withval
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ eval "$as_ac_var=yes"
else
-- ac_pgsql_libdir=
--
+ ac_pgsql_libdir=
+
-fi;
--
--
--
--if test "$compile_pgsql_plugin" = "yes"; then
-- if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
++fi
++
+
+
+
+ if test "$compile_pgsql_plugin" = "yes"; then
+ if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
- echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
-echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6
-- pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
--
--pgsql_incdir=NO
--for i in $pgsql_incdirs;
--do
-- for j in libpq-fe.h;
-- do
-- echo "configure: 37271: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- pgsql_incdir=$i
-- break 2
-- fi
-- done
--done
--
-- if test -r $pgsql_incdir/libpq-fe.h; then
-- PG_INCDIR=$pgsql_incdir
++ { echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
++echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6; }
+ pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
+
+ pgsql_incdir=NO
+@@ -37266,7 +40674,7 @@
+ do
+ for j in libpq-fe.h;
+ do
+- echo "configure: 37269: $i/$j" >&5
++ echo "configure: 40677: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pgsql_incdir=$i
+@@ -37277,17 +40685,17 @@
+
+ if test -r $pgsql_incdir/libpq-fe.h; then
+ PG_INCDIR=$pgsql_incdir
- echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
-echo "${ECHO_T}$PG_INCDIR" >&6
--
-- else
-- compile_pgsql_plugin="no"
++ { echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
++echo "${ECHO_T}$PG_INCDIR" >&6; }
+
+ else
+ compile_pgsql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
--
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
+
- echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
-echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6
-- pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
++echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6; }
+ pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--pgsql_libdir=NO
--for i in $pgsql_libdirs;
--do
-- for j in libpq.so;
-- do
-- echo "configure: 37300: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- pgsql_libdir=$i
-- break 2
-- fi
-- done
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
- done
+ pgsql_libdir=NO
+@@ -37295,7 +40703,7 @@
+ do
+ for j in libpq.so;
+ do
+- echo "configure: 37298: $i/$j" >&5
++ echo "configure: 40706: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pgsql_libdir=$i
+@@ -37306,24 +40714,24 @@
-- if test -r $pgsql_libdir/libpq.so; then
-- PG_LIBDIR=$pgsql_libdir
+ if test -r $pgsql_libdir/libpq.so; then
+ PG_LIBDIR=$pgsql_libdir
- echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
-echo "${ECHO_T}$PG_LIBDIR" >&6
++ { echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
++echo "${ECHO_T}$PG_LIBDIR" >&6; }
-- else
-- compile_pgsql_plugin="no"
+ else
+ compile_pgsql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
-- else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
+ else
- echo "$as_me:$LINENO: checking for pg_config" >&5
-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
-- if test -n "$PG_CONFIG"; then
-- kde_cv_path="$PG_CONFIG";
-- else
-- kde_cache=`echo pg_config | sed 'y%./+-%__p_%'`
++ { echo "$as_me:$LINENO: checking for pg_config" >&5
++echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
+ if test -n "$PG_CONFIG"; then
+ kde_cv_path="$PG_CONFIG";
+ else
+ kde_cache=`echo pg_config | sed 'y%./+-%__p_%'`
- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for long double" >&5
-+echo $ECHO_N "checking for long double... $ECHO_C" >&6
-+if test "${ac_cv_c_long_double+set}" = set; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- kde_cv_path="NONE"
-- kde_save_IFS=$IFS
-- IFS=':'
-- dirs=""
-- for dir in $PATH; do
-- dirs="$dirs $dir"
-- done
-- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin $dirs"
-- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin "
-- fi
-- IFS=$kde_save_IFS
--
-- for dir in $dirs; do
-- if test -x "$dir/pg_config"; then
-- if test -n ""
-- then
-- evalstr="$dir/pg_config 2>&1 "
-- if eval $evalstr; then
-- kde_cv_path="$dir/pg_config"
-- break
-- fi
-- else
-- kde_cv_path="$dir/pg_config"
-- break
-- fi
-- fi
-- done
-+ if test "$cross_compiling" = yes; then
-+ ac_cv_c_long_double=no
+@@ -37366,15 +40774,15 @@
+ fi
-- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <math.h>
-
--fi
-+int main() {
-+/* The Stardent Vistra knows sizeof(long double), but does not support it. */
-+long double foo = 1.0;
-+char buffer[10];
-+/* On Ultrix 4.3 cc, long double is 4 and double is 8. */
-+int result = (sizeof(long double) < sizeof(double));
-+/* the following is needed for a broken printf in glibc2 */
-+if (!result) {
-+ foo = foo * 3;
-+ sprintf(buffer,"%0.0Lf",foo);
-+ result = strcmp(buffer, "3");
-+/* and now something mean ;-) */
-+ foo = powl(fabsl(foo), 1);
-+}
-+exit(result); }
-
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_long_double=yes
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+( exit $ac_status )
-+ac_cv_c_long_double=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-
-- fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
-+echo "${ECHO_T}$ac_cv_c_long_double" >&6
-+ if test $ac_cv_c_long_double = yes; then
-
-- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LONG_DOUBLE 1
-+_ACEOF
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-+ fi
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
-- else
+ else
- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-- PG_CONFIG=$kde_cv_path
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PG_CONFIG=$kde_cv_path
-- fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ fi
+@@ -37387,8 +40795,8 @@
+ PG_LIBDIR=$pgsql_libdir
-
-- if test -n "$PG_CONFIG"; then
-- pgsql_incdir=`$PG_CONFIG --includedir`
-- pgsql_libdir=`$PG_CONFIG --libdir`
-- PG_INCDIR=$pgsql_incdir
-- PG_LIBDIR=$pgsql_libdir
-+ kde_save_LDFLAGS="$LDFLAGS"
-+ kde_save_LIBS="$LIBS"
-+ LDFLAGS="$LDFLAGS $all_libraries"
-+ case $host_os in
-+ aix*) LDFLAGS="-brtl $LDFLAGS"
-+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+ ;;
-+ esac
-+ echo "$as_me:$LINENO: checking for isinf in -lm" >&5
-+echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6
-+if test "${ac_cv_lib_m_isinf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-- compile_pgsql_plugin="yes"
+ compile_pgsql_plugin="yes"
- echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
-echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6
-- else
-- compile_pgsql_plugin="no"
-- fi
-- fi
-+/* 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 isinf ();
-+int
-+main ()
-+{
-+isinf ();
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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_lib_m_isinf=yes
- else
-- { echo "$as_me:$LINENO: Not attempting to configure PostgreSQL as requested" >&5
--echo "$as_me: Not attempting to configure PostgreSQL as requested" >&6;}
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_m_isinf=no
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6
-+if test $ac_cv_lib_m_isinf = yes; then
++ { echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
++echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6; }
+ else
+ compile_pgsql_plugin="no"
+ fi
+@@ -37412,33 +40820,33 @@
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_FUNC_ISINF 1
-+_ACEOF
--if test "$compile_pgsql_plugin" = "yes"; then
-- compile_pgsql_plugin_TRUE=
-- compile_pgsql_plugin_FALSE='#'
--else
-- compile_pgsql_plugin_TRUE='#'
-- compile_pgsql_plugin_FALSE=
- fi
-
-+ LDFLAGS="$kde_save_LDFLAGS"
-+ LIBS="$kde_save_LIBS"
-
-
-
-
-# Check whether --with-pqxx-includes or --without-pqxx-includes was given.
--if test "${with_pqxx_includes+set}" = set; then
++# Check whether --with-pqxx-includes was given.
+ if test "${with_pqxx_includes+set}" = set; then
- withval="$with_pqxx_includes"
-+echo "$as_me:$LINENO: checking for SQL support in QT" >&5
-+echo $ECHO_N "checking for SQL support in QT... $ECHO_C" >&6
+-
++ withval=$with_pqxx_includes;
+ ac_pqxx_incdir=$withval
-- ac_pqxx_incdir=$withval
-+LIBS_SAVE_KWSL="$LIBS"
-+CXXFLAGS_SAVE_KWSL="$CXXFLAGS"
-+CFLAGS_SAVE_KWSL="$CFLAGS"
+ else
+ ac_pqxx_incdir=
--else
-- ac_pqxx_incdir=
-
-fi;
++fi
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-# Check whether --with-pqxx-libraries or --without-pqxx-libraries was given.
-if test "${with_pqxx_libraries+set}" = set; then
- withval="$with_pqxx_libraries"
-- ac_pqxx_libdir=$withval
++# Check whether --with-pqxx-libraries was given.
++if test "${with_pqxx_libraries+set}" = set; then
++ withval=$with_pqxx_libraries;
+ ac_pqxx_libdir=$withval
--else
-- ac_pqxx_libdir=
-+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-+CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes"
+ else
+ ac_pqxx_libdir=
-fi;
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
++fi
++
-+#include <qglobal.h>
--if test "$compile_pgsql_plugin" = "yes"; then
+ if test "$compile_pgsql_plugin" = "yes"; then
- echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
-echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6
-- pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
-+int
-+main ()
-+{
++ { echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
++echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6; }
+ pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
--pqxx_incdir=NO
--for i in $pqxx_incdirs;
--do
-- for j in pqxx/pqxx;
-- do
-- echo "configure: 37451: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- pqxx_incdir=$i
-- break 2
-- fi
-- done
--done
-+#ifdef QT_NO_SQL
-+#error "No QT-SQL support"
-+#endif
+ pqxx_incdir=NO
+@@ -37446,7 +40854,7 @@
+ do
+ for j in pqxx/pqxx;
+ do
+- echo "configure: 37449: $i/$j" >&5
++ echo "configure: 40857: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pqxx_incdir=$i
+@@ -37457,19 +40865,19 @@
-- if test -r $pqxx_incdir/pqxx/pqxx; then
-- PQXX_INCDIR=$pqxx_incdir
+ if test -r $pqxx_incdir/pqxx/pqxx; then
+ PQXX_INCDIR=$pqxx_incdir
- echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
-echo "${ECHO_T}$PQXX_INCDIR" >&6
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_trycompile_kwsl_qtsql=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ { echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
++echo "${ECHO_T}$PQXX_INCDIR" >&6; }
-- else
-- compile_pgsql_plugin="no"
+ else
+ compile_pgsql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
-+ac_trycompile_kwsl_qtsql=no
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--if test "$compile_pgsql_plugin" = "yes"; then
+ if test "$compile_pgsql_plugin" = "yes"; then
- echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
-echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6
-- pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+CXXFLAGS="$CXXFLAGS_SAVE_KWSL"
-+LIBS="$LIBS_SAVE_KWSL"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ { echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
++echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6; }
+ pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--pqxx_libdir=NO
--for i in $pqxx_libdirs;
--do
-- for j in libpqxx.so;
-- do
-- echo "configure: 37482: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- pqxx_libdir=$i
-- break 2
-- fi
-- done
--done
+ pqxx_libdir=NO
+@@ -37477,7 +40885,7 @@
+ do
+ for j in libpqxx.so;
+ do
+- echo "configure: 37480: $i/$j" >&5
++ echo "configure: 40888: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pqxx_libdir=$i
+@@ -37488,13 +40896,13 @@
-- if test -r $pqxx_libdir/libpqxx.so; then
-- PQXX_LIBDIR=$pqxx_libdir
+ if test -r $pqxx_libdir/libpqxx.so; then
+ PQXX_LIBDIR=$pqxx_libdir
- echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
-echo "${ECHO_T}$PQXX_LIBDIR" >&6
-+if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then
-+ SQLDIR=sql
++ { echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
++echo "${ECHO_T}$PQXX_LIBDIR" >&6; }
-- else
-- compile_pgsql_plugin="no"
+ else
+ compile_pgsql_plugin="no"
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-- fi
-+ echo "$as_me:$LINENO: result: QT supports SQL - compile qtsqlmailmerge" >&5
-+echo "${ECHO_T}QT supports SQL - compile qtsqlmailmerge" >&6
-+else
-+ SQLDIR=
-+
-+ echo "$as_me:$LINENO: result: QT supports SQL -- qtsqlmailmerge will not be built" >&5
-+echo "${ECHO_T}QT supports SQL -- qtsqlmailmerge will not be built" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ fi
fi
+@@ -37511,8 +40919,8 @@
--if test "$compile_pgsql_plugin" = "yes"; then
-- compile_pgsql_plugin_TRUE=
-- compile_pgsql_plugin_FALSE='#'
-+if test -n "$SQLDIR"; then
-+ include_sql_TRUE=
-+ include_sql_FALSE='#'
- else
-- compile_pgsql_plugin_TRUE='#'
-- compile_pgsql_plugin_FALSE=
-+ include_sql_TRUE='#'
-+ include_sql_FALSE=
- fi
-
-+KWMF_INCLUDES='-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf'
-
-+KSTORE_INCLUDES='-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store'
-
-echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
-echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6
-+KOTEXT_INCLUDES='-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext'
++{ echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
++echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6; }
--ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
--knewstuff_libraries=""
--knewstuff_includes=""
-+KOPAINTER_INCLUDES='-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter'
+ ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
+ knewstuff_libraries=""
+@@ -37528,7 +40936,7 @@
+ do
+ for j in knewstuff/downloaddialog.h;
+ do
+- echo "configure: 37531: $i/$j" >&5
++ echo "configure: 40939: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ knewstuff_incdir=$i
+@@ -37545,7 +40953,7 @@
+ do
+ for j in libknewstuff.so;
+ do
+- echo "configure: 37548: $i/$j" >&5
++ echo "configure: 40956: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ knewstuff_libdir=$i
+@@ -37569,11 +40977,11 @@
+ eval "$ac_cv_have_knewstuff"
--if test "${ac_cv_have_knewstuff+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+KOPALETTE_INCLUDES='-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette'
-
-+KOFFICECORE_INCLUDES='-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore'
-
--knewstuff_incdir=NO
--for i in $kde_incdirs;
--do
-- for j in knewstuff/downloaddialog.h;
-- do
-- echo "configure: 37533: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- knewstuff_incdir=$i
-- break 2
-- fi
-- done
--done
-+KOFFICEUI_INCLUDES='-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui'
-
--ac_knewstuff_includes="$knewstuff_incdir"
-+KFORMULA_INCLUDES='-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula'
-
-+KOPROPERTY_INCLUDES='-I$(top_srcdir)/lib -I$(top_builddir)/lib'
-
--knewstuff_libdir=NO
--for i in $kde_libdirs;
--do
-- for j in libknewstuff.so;
-- do
-- echo "configure: 37550: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- knewstuff_libdir=$i
-- break 2
-- fi
-- done
--done
-+KROSS_INCLUDES='-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross'
-
--ac_knewstuff_libraries="$knewstuff_libdir"
-+LIB_KOFFICEUI='$(top_builddir)/lib/kofficeui/libkofficeui.la'
-
--if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
-- ac_cv_have_knewstuff="have_knewstuff=no"
-- ac_knewstuff_notfound=""
--else
-- have_knewstuff="yes"
--fi
-+LIB_KOFFICECORE='$(top_builddir)/lib/kofficecore/libkofficecore.la'
-
--fi
-+LIB_KSTORE='$(top_builddir)/lib/store/libkstore.la'
-
-+LIB_KOTEXT='$(top_builddir)/lib/kotext/libkotext.la'
-
--eval "$ac_cv_have_knewstuff"
-+LIB_KOPAINTER='$(top_builddir)/lib/kopainter/libkopainter.la'
-
--if test "$have_knewstuff" != yes; then
+ if test "$have_knewstuff" != yes; then
- echo "$as_me:$LINENO: result: $have_knewstuff" >&5
-echo "${ECHO_T}$have_knewstuff" >&6
--else
++ { echo "$as_me:$LINENO: result: $have_knewstuff" >&5
++echo "${ECHO_T}$have_knewstuff" >&6; }
+ else
- echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
-echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6
-+LIB_KOPALETTE='$(top_builddir)/lib/kopalette/libkopalette.la'
++ { echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
++echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6; }
-- CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
-+LIB_KWMF='$(top_builddir)/lib/kwmf/libkwmf.la'
+ CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
-- LIB_KNEWSTUFF='-lknewstuff'
-+LIB_KOWMF='$(top_builddir)/lib/kwmf/libkowmf.la'
+@@ -37581,8 +40989,8 @@
--fi
-+LIB_KFORMULA='$(top_builddir)/lib/kformula/libkformulalib.la'
+ fi
-echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
-echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6
--if test "${ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- test "$cross_compiling" = yes &&
-- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-- { (exit 1); exit 1; }; }
--if test -r "kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp"; then
-- ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=yes
--else
-- ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=no
--fi
--fi
++{ echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
++echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6; }
+ if test "${ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37596,8 +41004,8 @@
+ ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=no
+ fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
-echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6
--if test $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp = yes; then
-- have_internal_feedback="yes"
-+LIB_KOPROPERTY='$(top_builddir)/lib/koproperty/libkoproperty.la'
++{ echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
++echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6; }
+ if test $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp = yes; then
+ have_internal_feedback="yes"
--else
-- have_internal_feedback="no"
-+LIB_KROSS_API='$(top_builddir)/lib/kross/api/libkrossapi.la'
+@@ -37607,8 +41015,8 @@
+ fi
--fi
-+LIB_KROSS_MAIN='$(top_builddir)/lib/kross/main/libkrossmain.la'
-
-echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
-echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6
-+interfacedir='$(top_srcdir)/lib/interfaces'
++{ echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
++echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6; }
--ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
--kfeedback_libraries=""
--kfeedback_includes=""
-+KOFFICE_LIBS='$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)'
-
--if test "${ac_cv_have_kfeedback+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+KOFFICE_INCLUDES='$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)'
-
-
--kfeedback_incdir=NO
--for i in $kde_incdirs;
--do
-- for j in kfeedbackwizard.h;
-- do
-- echo "configure: 37629: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- kfeedback_incdir=$i
-- break 2
-- fi
-- done
--done
-
--ac_kfeedback_includes="$kfeedback_incdir"
-+cat >>confdefs.h <<_ACEOF
-+#define PREFIX "$prefix"
-+_ACEOF
-+
-
-
--kfeedback_libdir=NO
--for i in $kde_libdirs;
--do
-- for j in libkfeedbackwizard.so;
-- do
-- echo "configure: 37646: $i/$j" >&5
-- if test -r "$i/$j"; then
-- echo "taking that" >&5
-- kfeedback_libdir=$i
-- break 2
-- fi
-- done
--done
-
--ac_kfeedback_libraries="$kfeedback_libdir"
-
--if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then
-- ac_cv_have_kfeedback="have_kfeedback=no"
-- ac_kfeedback_notfound=""
--else
-- have_kfeedback="yes"
--fi
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--fi
-
-
--eval "$ac_cv_have_kfeedback"
-
--INC_KFEEDBACK=''
--LIB_KFEEDBACK=''
--if test "$have_kfeedback" != yes; then
-- if test "$have_internal_feedback" = yes; then
-- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
-- use_kexifb="yes"
+ ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
+ kfeedback_libraries=""
+@@ -37624,7 +41032,7 @@
+ do
+ for j in kfeedbackwizard.h;
+ do
+- echo "configure: 37627: $i/$j" >&5
++ echo "configure: 41035: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ kfeedback_incdir=$i
+@@ -37641,7 +41049,7 @@
+ do
+ for j in libkfeedbackwizard.so;
+ do
+- echo "configure: 37644: $i/$j" >&5
++ echo "configure: 41052: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ kfeedback_libdir=$i
+@@ -37670,19 +41078,19 @@
+ if test "$have_internal_feedback" = yes; then
+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
+ use_kexifb="yes"
- echo "$as_me:$LINENO: result: using internal" >&5
-echo "${ECHO_T}using internal" >&6
-- INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
-- LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
-- else
-- use_kexifb="no"
++ { echo "$as_me:$LINENO: result: using internal" >&5
++echo "${ECHO_T}using internal" >&6; }
+ INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
+ LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
+ else
+ use_kexifb="no"
- echo "$as_me:$LINENO: result: dont use" >&5
-echo "${ECHO_T}dont use" >&6
-- fi
--else
-- use_kexifb="no"
++ { echo "$as_me:$LINENO: result: dont use" >&5
++echo "${ECHO_T}dont use" >&6; }
+ fi
+ else
+ use_kexifb="no"
- echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
-echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6
++ { echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
++echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6; }
-- CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
-- LIB_KFEEDBACK='-lkfeedbackwizard'
--fi
-+ kde_safe_cppflags=$CPPFLAGS
-+ CPPFLAGS="$CPPFLAGS $all_includes"
-+ 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
+@@ -37721,8 +41129,8 @@
+ #fi
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
--if test "$use_kexifb" = "yes"; then
-- use_kexifeedback_TRUE=
-- use_kexifeedback_FALSE='#'
--else
-- use_kexifeedback_TRUE='#'
-- use_kexifeedback_FALSE=
-+for ac_header in kspell2/broker.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--
--
--# KexiMDB isn't built as part of Kexi right now.
--#AC_ARG_ENABLE(keximdb,
--# AC_HELP_STRING([--enable-keximdb],
--# [build KexiMDB (MS Access) plugin [default=no]]),
--# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no)
--#
--#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno")
--
--# Check whether --enable-kexi-reports or --disable-kexi-reports was given.
--if test "${enable_kexi_reports+set}" = set; then
-- enableval="$enable_kexi_reports"
-- compile_kexi_reports_plugin=$enableval
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
-- compile_kexi_reports_plugin=no
--fi;
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-
--if test "x$compile_kexi_reports_plugin" != "xno"; then
-- compile_kexi_reports_plugin_TRUE=
-- compile_kexi_reports_plugin_FALSE='#'
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- compile_kexi_reports_plugin_TRUE='#'
-- compile_kexi_reports_plugin_FALSE=
-+ ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
--if test "$compile_kexi_reports_plugin" == "yes"; then
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
--cat >>confdefs.h <<\_ACEOF
--#define KEXI_REPORTS_SUPPORT 1
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-
-+done
-
-echo "$as_me:$LINENO: checking for Python directory" >&5
-echo $ECHO_N "checking for Python directory... $ECHO_C" >&6
-+ CPPFLAGS=$kde_safe_cppflags
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ echo "$as_me:$LINENO: checking for Python directory" >&5
++echo $ECHO_N "checking for Python directory... $ECHO_C" >&6; }
--if test "${kde_cv_pythondir+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+ if test "${kde_cv_pythondir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -37738,19 +41146,19 @@
-- if test -z "$PYTHONDIR"; then
-- kde_cv_pythondir=/usr/local
-- else
-- kde_cv_pythondir="$PYTHONDIR"
-- fi
-+ if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then
--fi
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBKSPELL2 1
-+_ACEOF
-+ LIBKSPELL2="-lkspell2"
-+ echo "$as_me:$LINENO: result: found in $ac_kspell2_includes" >&5
-+echo "${ECHO_T}found in $ac_kspell2_includes" >&6
-+ else
-+ LIBKSPELL2=""
-+ echo "$as_me:$LINENO: result: not found -- spell-checking will be disabled" >&5
-+echo "${ECHO_T}not found -- spell-checking will be disabled" >&6
-+ fi
-
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Check whether --with-pythondir or --without-pythondir was given.
--if test "${with_pythondir+set}" = set; then
++# Check whether --with-pythondir was given.
+ if test "${with_pythondir+set}" = set; then
- withval="$with_pythondir"
+-
++ withval=$with_pythondir;
+ ac_python_dir=$withval
-- ac_python_dir=$withval
-+# Check whether --enable-scripting or --disable-scripting was given.
-+if test "${enable_scripting+set}" = set; then
-+ enableval="$enable_scripting"
-+ compile_kross=$enableval
-+else
-+ compile_kross=yes
-+fi;
-
-+
-+if test "x$compile_kross" = "xyes"; then
-+ compile_kross_TRUE=
-+ compile_kross_FALSE='#'
else
-- ac_python_dir=$kde_cv_pythondir
-+ compile_kross_TRUE='#'
-+ compile_kross_FALSE=
-+fi
+ ac_python_dir=$kde_cv_pythondir
-fi;
++fi
++
-echo "$as_me:$LINENO: result: $ac_python_dir" >&5
-echo "${ECHO_T}$ac_python_dir" >&6
-+###############################
-+# Check if Python is installed.
++{ echo "$as_me:$LINENO: result: $ac_python_dir" >&5
++echo "${ECHO_T}$ac_python_dir" >&6; }
-+if test "x$compile_kross" = "xyes" ; then
-+ #KDE_CHECK_PYTHON(2.3)
+@@ -37764,8 +41172,8 @@
+ version=""2.4""
+ fi
-@@ -37791,7 +62080,7 @@
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -37774,7 +41182,7 @@
do
for j in Python.h;
do
-- echo "configure: 37794: $i/$j" >&5
-+ echo "configure: 62083: $i/$j" >&5
+- echo "configure: 37777: $i/$j" >&5
++ echo "configure: 41185: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37807,7 +62096,7 @@
+@@ -37790,7 +41198,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37810: $i/$j" >&5
-+ echo "configure: 62099: $i/$j" >&5
+- echo "configure: 37793: $i/$j" >&5
++ echo "configure: 41201: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37831,7 +62120,7 @@
+@@ -37814,7 +41222,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37834: $i/$j" >&5
-+ echo "configure: 62123: $i/$j" >&5
+- echo "configure: 37817: $i/$j" >&5
++ echo "configure: 41225: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37847,7 +62136,7 @@
+@@ -37830,7 +41238,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37850: $i/$j" >&5
-+ echo "configure: 62139: $i/$j" >&5
+- echo "configure: 37833: $i/$j" >&5
++ echo "configure: 41241: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37863,7 +62152,7 @@
+@@ -37846,7 +41254,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37866: $i/$j" >&5
-+ echo "configure: 62155: $i/$j" >&5
+- echo "configure: 37849: $i/$j" >&5
++ echo "configure: 41257: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37891,7 +62180,7 @@
+@@ -37874,7 +41282,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37894: $i/$j" >&5
-+ echo "configure: 62183: $i/$j" >&5
+- echo "configure: 37877: $i/$j" >&5
++ echo "configure: 41285: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37935,7 +62224,7 @@
+@@ -37890,8 +41298,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -37908,8 +41316,8 @@
+ version=""2.3""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -37918,7 +41326,7 @@
do
for j in Python.h;
do
-- echo "configure: 37938: $i/$j" >&5
-+ echo "configure: 62227: $i/$j" >&5
+- echo "configure: 37921: $i/$j" >&5
++ echo "configure: 41329: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37951,7 +62240,7 @@
+@@ -37934,7 +41342,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37954: $i/$j" >&5
-+ echo "configure: 62243: $i/$j" >&5
+- echo "configure: 37937: $i/$j" >&5
++ echo "configure: 41345: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37975,7 +62264,7 @@
+@@ -37958,7 +41366,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37978: $i/$j" >&5
-+ echo "configure: 62267: $i/$j" >&5
+- echo "configure: 37961: $i/$j" >&5
++ echo "configure: 41369: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37991,7 +62280,7 @@
+@@ -37974,7 +41382,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37994: $i/$j" >&5
-+ echo "configure: 62283: $i/$j" >&5
+- echo "configure: 37977: $i/$j" >&5
++ echo "configure: 41385: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38007,7 +62296,7 @@
+@@ -37990,7 +41398,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38010: $i/$j" >&5
-+ echo "configure: 62299: $i/$j" >&5
+- echo "configure: 37993: $i/$j" >&5
++ echo "configure: 41401: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38035,7 +62324,7 @@
+@@ -38018,7 +41426,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38038: $i/$j" >&5
-+ echo "configure: 62327: $i/$j" >&5
+- echo "configure: 38021: $i/$j" >&5
++ echo "configure: 41429: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38079,7 +62368,7 @@
+@@ -38034,8 +41442,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38052,8 +41460,8 @@
+ version=""2.2""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -38062,7 +41470,7 @@
do
for j in Python.h;
do
-- echo "configure: 38082: $i/$j" >&5
-+ echo "configure: 62371: $i/$j" >&5
+- echo "configure: 38065: $i/$j" >&5
++ echo "configure: 41473: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38095,7 +62384,7 @@
+@@ -38078,7 +41486,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38098: $i/$j" >&5
-+ echo "configure: 62387: $i/$j" >&5
+- echo "configure: 38081: $i/$j" >&5
++ echo "configure: 41489: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38119,7 +62408,7 @@
+@@ -38102,7 +41510,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38122: $i/$j" >&5
-+ echo "configure: 62411: $i/$j" >&5
+- echo "configure: 38105: $i/$j" >&5
++ echo "configure: 41513: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38135,7 +62424,7 @@
+@@ -38118,7 +41526,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38138: $i/$j" >&5
-+ echo "configure: 62427: $i/$j" >&5
+- echo "configure: 38121: $i/$j" >&5
++ echo "configure: 41529: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38151,7 +62440,7 @@
+@@ -38134,7 +41542,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38154: $i/$j" >&5
-+ echo "configure: 62443: $i/$j" >&5
+- echo "configure: 38137: $i/$j" >&5
++ echo "configure: 41545: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38179,7 +62468,7 @@
+@@ -38162,7 +41570,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38182: $i/$j" >&5
-+ echo "configure: 62471: $i/$j" >&5
+- echo "configure: 38165: $i/$j" >&5
++ echo "configure: 41573: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38223,7 +62512,7 @@
+@@ -38178,8 +41586,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38196,8 +41604,8 @@
+ version=""2.1""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -38206,7 +41614,7 @@
do
for j in Python.h;
do
-- echo "configure: 38226: $i/$j" >&5
-+ echo "configure: 62515: $i/$j" >&5
+- echo "configure: 38209: $i/$j" >&5
++ echo "configure: 41617: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38239,7 +62528,7 @@
+@@ -38222,7 +41630,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38242: $i/$j" >&5
-+ echo "configure: 62531: $i/$j" >&5
+- echo "configure: 38225: $i/$j" >&5
++ echo "configure: 41633: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38263,7 +62552,7 @@
+@@ -38246,7 +41654,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38266: $i/$j" >&5
-+ echo "configure: 62555: $i/$j" >&5
+- echo "configure: 38249: $i/$j" >&5
++ echo "configure: 41657: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38279,7 +62568,7 @@
+@@ -38262,7 +41670,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38282: $i/$j" >&5
-+ echo "configure: 62571: $i/$j" >&5
+- echo "configure: 38265: $i/$j" >&5
++ echo "configure: 41673: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38295,7 +62584,7 @@
+@@ -38278,7 +41686,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38298: $i/$j" >&5
-+ echo "configure: 62587: $i/$j" >&5
+- echo "configure: 38281: $i/$j" >&5
++ echo "configure: 41689: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38323,7 +62612,7 @@
+@@ -38306,7 +41714,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38326: $i/$j" >&5
-+ echo "configure: 62615: $i/$j" >&5
+- echo "configure: 38309: $i/$j" >&5
++ echo "configure: 41717: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38367,7 +62656,7 @@
+@@ -38322,8 +41730,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38340,8 +41748,8 @@
+ version=""2.0""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -38350,7 +41758,7 @@
do
for j in Python.h;
do
-- echo "configure: 38370: $i/$j" >&5
-+ echo "configure: 62659: $i/$j" >&5
+- echo "configure: 38353: $i/$j" >&5
++ echo "configure: 41761: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38383,7 +62672,7 @@
+@@ -38366,7 +41774,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38386: $i/$j" >&5
-+ echo "configure: 62675: $i/$j" >&5
+- echo "configure: 38369: $i/$j" >&5
++ echo "configure: 41777: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38407,7 +62696,7 @@
+@@ -38390,7 +41798,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38410: $i/$j" >&5
-+ echo "configure: 62699: $i/$j" >&5
+- echo "configure: 38393: $i/$j" >&5
++ echo "configure: 41801: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38423,7 +62712,7 @@
+@@ -38406,7 +41814,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38426: $i/$j" >&5
-+ echo "configure: 62715: $i/$j" >&5
+- echo "configure: 38409: $i/$j" >&5
++ echo "configure: 41817: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38439,7 +62728,7 @@
+@@ -38422,7 +41830,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38442: $i/$j" >&5
-+ echo "configure: 62731: $i/$j" >&5
+- echo "configure: 38425: $i/$j" >&5
++ echo "configure: 41833: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38467,7 +62756,7 @@
+@@ -38450,7 +41858,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38470: $i/$j" >&5
-+ echo "configure: 62759: $i/$j" >&5
+- echo "configure: 38453: $i/$j" >&5
++ echo "configure: 41861: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38511,7 +62800,7 @@
+@@ -38466,8 +41874,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38484,8 +41892,8 @@
+ version=""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -38494,7 +41902,7 @@
do
for j in Python.h;
do
-- echo "configure: 38514: $i/$j" >&5
-+ echo "configure: 62803: $i/$j" >&5
+- echo "configure: 38497: $i/$j" >&5
++ echo "configure: 41905: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38527,7 +62816,7 @@
+@@ -38510,7 +41918,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38530: $i/$j" >&5
-+ echo "configure: 62819: $i/$j" >&5
+- echo "configure: 38513: $i/$j" >&5
++ echo "configure: 41921: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38551,7 +62840,7 @@
+@@ -38534,7 +41942,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38554: $i/$j" >&5
-+ echo "configure: 62843: $i/$j" >&5
+- echo "configure: 38537: $i/$j" >&5
++ echo "configure: 41945: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38567,7 +62856,7 @@
+@@ -38550,7 +41958,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38570: $i/$j" >&5
-+ echo "configure: 62859: $i/$j" >&5
+- echo "configure: 38553: $i/$j" >&5
++ echo "configure: 41961: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38583,7 +62872,7 @@
+@@ -38566,7 +41974,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38586: $i/$j" >&5
-+ echo "configure: 62875: $i/$j" >&5
+- echo "configure: 38569: $i/$j" >&5
++ echo "configure: 41977: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38611,7 +62900,7 @@
+@@ -38594,7 +42002,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38614: $i/$j" >&5
-+ echo "configure: 62903: $i/$j" >&5
+- echo "configure: 38597: $i/$j" >&5
++ echo "configure: 42005: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -46165,103 +70454,328 @@
- kde_save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS $PYTHONLIB"
+@@ -38610,8 +42018,8 @@
--cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38624,11 +42032,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -38662,23 +42070,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
+@@ -38687,9 +42108,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+#include <Python.h>
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -38700,16 +42122,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -38720,11 +42142,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -38758,23 +42180,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
+@@ -38783,9 +42218,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+int
-+main ()
-+{
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -38796,16 +42232,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -38816,11 +42252,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -38854,23 +42290,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
+@@ -38879,9 +42328,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+ PySys_SetArgv(1, 0);
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -38892,16 +42342,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -38912,11 +42362,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -38950,23 +42400,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
+@@ -38975,9 +42438,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+ ;
-+ 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
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (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
-+ kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -38988,16 +42452,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39008,11 +42472,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -39046,23 +42510,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
+@@ -39071,9 +42548,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39084,16 +42562,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39104,11 +42582,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -39142,23 +42620,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
+@@ -39167,9 +42658,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39180,16 +42672,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39200,11 +42692,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -39238,23 +42730,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
+@@ -39263,9 +42768,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39276,16 +42782,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39296,11 +42802,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -39334,23 +42840,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
+@@ -39359,9 +42878,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39372,16 +42892,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39392,11 +42912,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -39430,23 +42950,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
+@@ -39455,9 +42988,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ kde_python_link_found=yes
-+ if test ! "m_and_thread_and_db_special" = normal; then
-+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39468,16 +43002,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39488,11 +43022,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -39526,23 +43060,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
+@@ -39551,9 +43098,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&5
-+echo "$as_me: WARNING: it seems, Python depends on another library.
-+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+ and contact the authors to let them know about this problem" >&2;}
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39564,16 +43112,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39584,11 +43132,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -39622,23 +43170,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
+@@ -39647,9 +43208,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39660,16 +43222,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39680,11 +43242,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -39718,23 +43280,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
+@@ -39743,9 +43318,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39756,16 +43332,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39776,11 +43352,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -39814,23 +43390,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
+@@ -39839,9 +43428,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39852,16 +43442,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -39894,11 +43484,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -39932,23 +43522,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
+@@ -39957,9 +43560,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -39970,16 +43574,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -39990,11 +43594,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -40028,23 +43632,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
+@@ -40053,9 +43670,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+ LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40066,16 +43684,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40086,11 +43704,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -40124,23 +43742,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
+@@ -40149,9 +43780,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40162,16 +43794,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40182,11 +43814,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -40220,23 +43852,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
+@@ -40245,9 +43890,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40258,16 +43904,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40278,11 +43924,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -40316,23 +43962,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
+@@ -40341,9 +44000,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40354,16 +44014,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40374,11 +44034,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -40412,23 +44072,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
+@@ -40437,9 +44110,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40450,16 +44124,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40470,11 +44144,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -40508,23 +44182,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
+@@ -40533,9 +44220,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40546,16 +44234,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40566,11 +44254,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -40604,23 +44292,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
+@@ -40629,9 +44330,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40642,16 +44344,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40662,11 +44364,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -40700,23 +44402,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
+@@ -40725,9 +44440,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40738,16 +44454,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40758,11 +44474,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -40796,23 +44512,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
+@@ -40821,9 +44550,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40834,16 +44564,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40854,11 +44584,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -40892,23 +44622,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
+@@ -40917,9 +44660,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -40930,16 +44674,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -40950,11 +44694,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -40988,23 +44732,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
+@@ -41013,9 +44770,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+# Compile the Kross python plugin only if both, $LIBPYTHON and
-+# $PYTHONINC, are defined.
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41026,16 +44784,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41046,11 +44804,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -41084,23 +44842,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
+@@ -41109,9 +44880,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41122,16 +44894,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -41165,11 +44937,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -41203,23 +44975,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
+@@ -41228,9 +45013,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+if test -n "$LIBPYTHON" && test -n "$PYTHONINC"; then
-+ compile_kross_python_TRUE=
-+ compile_kross_python_FALSE='#'
-+else
-+ compile_kross_python_TRUE='#'
-+ compile_kross_python_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41241,16 +45027,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41261,11 +45047,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -41299,23 +45085,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
+@@ -41324,9 +45123,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41337,16 +45137,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41357,11 +45157,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -41395,23 +45195,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
+@@ -41420,9 +45233,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+###############################
-+# Check for Ruby
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41433,16 +45247,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41453,11 +45267,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -41491,23 +45305,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
+@@ -41516,9 +45343,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+if test "x$compile_kross" = "xyes" ; then
-+ # Extract the first word of "ruby", so it can be a program name with args.
-+set dummy ruby; 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_RUBY+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$RUBY"; then
-+ ac_cv_prog_RUBY="$RUBY" # 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_RUBY="ruby"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41529,16 +45357,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41549,11 +45377,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -41587,23 +45415,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
+@@ -41612,9 +45453,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
-+fi
-+fi
-+RUBY=$ac_cv_prog_RUBY
-+if test -n "$RUBY"; then
-+ echo "$as_me:$LINENO: result: $RUBY" >&5
-+echo "${ECHO_T}$RUBY" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41625,16 +45467,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41645,11 +45487,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -41683,23 +45525,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
+@@ -41708,9 +45563,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41721,16 +45577,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41741,11 +45597,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -41779,23 +45635,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
+@@ -41804,9 +45673,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+ if test -n "$RUBY"; then
-+ echo "$as_me:$LINENO: checking for Ruby dirs" >&5
-+echo $ECHO_N "checking for Ruby dirs... $ECHO_C" >&6
-+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["archdir"])'`
-+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
-+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
-+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["rubyincludedir"])'`
-+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["libdir"])'`
-+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["LIBRUBYARG_SHARED"])'`
-+ RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["ENABLE_SHARED"])'`
-+ echo "$as_me:$LINENO: result:
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ libdir $RUBY_LIBDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ rubysharedenabled $RUBY_ENABLESHARED" >&5
-+echo "${ECHO_T}
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ libdir $RUBY_LIBDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ rubysharedenabled $RUBY_ENABLESHARED" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41817,16 +45687,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41837,11 +45707,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -41875,23 +45745,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
+@@ -41900,9 +45783,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -41913,16 +45797,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -41933,11 +45817,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -41971,23 +45855,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
+@@ -41996,9 +45893,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42009,16 +45907,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42029,11 +45927,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -42067,23 +45965,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
+@@ -42092,9 +46003,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42105,16 +46017,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42125,11 +46037,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -42163,23 +46075,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
+@@ -42188,9 +46113,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42201,16 +46127,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42221,11 +46147,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -42259,23 +46185,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
+@@ -42284,9 +46223,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42297,16 +46237,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42317,11 +46257,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -42355,23 +46295,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
+@@ -42380,9 +46333,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42393,16 +46347,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -42436,11 +46390,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -42474,23 +46428,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
+@@ -42499,9 +46466,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42512,16 +46480,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42532,11 +46500,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -42570,23 +46538,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
+@@ -42595,9 +46576,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+ echo "$as_me:$LINENO: checking for Ruby header" >&5
-+echo $ECHO_N "checking for Ruby header... $ECHO_C" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42608,16 +46590,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42628,11 +46610,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -42666,23 +46648,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
+@@ -42691,9 +46686,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-+ # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR
-+ RUBY_INCLUDEDIR=$RUBY_ARCHDIR
-+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42704,16 +46700,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42724,11 +46720,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -42762,23 +46758,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
+@@ -42787,9 +46796,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-+ RUBY_LIBDIR=""
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+ else
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6 # header
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42800,16 +46810,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42820,11 +46830,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -42858,23 +46868,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
+@@ -42883,9 +46906,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
-+ echo "$as_me:$LINENO: checking Ruby shared library" >&5
-+echo $ECHO_N "checking Ruby shared library... $ECHO_C" >&6
-+ if test "x$RUBY_ENABLESHARED" != "xyes" ; then
-+ echo "$as_me:$LINENO: result: shared library not found" >&5
-+echo "${ECHO_T}shared library not found" >&6
-+ RUBY_LIBDIR=""
-+ else
-+ if test -z "$RUBY_LIBRUBYARG" ; then
-+ echo "$as_me:$LINENO: result: link argument not found" >&5
-+echo "${ECHO_T}link argument not found" >&6
-+ RUBY_LIBDIR=""
-+ else
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6 # shared library link arg
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42896,16 +46920,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -42916,11 +46940,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -42954,23 +46978,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
+@@ -42979,9 +47016,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
-+ echo "$as_me:$LINENO: checking if C++ program with ruby can be compiled" >&5
-+echo $ECHO_N "checking if C++ program with ruby can be compiled... $ECHO_C" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -42992,16 +47030,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43012,11 +47050,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -43050,23 +47088,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
+@@ -43075,9 +47126,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43088,16 +47140,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43108,11 +47160,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -43146,23 +47198,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
+@@ -43171,9 +47236,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43184,16 +47250,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43204,11 +47270,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -43242,23 +47308,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
+@@ -43267,9 +47346,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43280,16 +47360,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43300,11 +47380,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -43338,23 +47418,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
+@@ -43363,9 +47456,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43376,16 +47470,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43396,11 +47490,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -43434,23 +47528,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
+@@ -43459,9 +47566,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -I$RUBY_INCLUDEDIR"
-+ if test "${ruby_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43472,16 +47580,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43492,11 +47600,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -43530,23 +47638,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
+@@ -43555,9 +47676,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43568,16 +47690,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43588,11 +47710,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -43626,23 +47748,36 @@
+ }
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+ 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
+@@ -43651,9 +47786,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
--#include <Python.h>
-+ #include <ruby.h>
-+ #include <version.h>
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
- int
- main ()
- {
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43664,16 +47800,16 @@
-- PySys_SetArgv(1, 0);
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -43707,11 +47843,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -43745,23 +47881,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
+@@ -43770,9 +47919,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
-+#error "need at least ruby 1.8.2\n"
-+#endif
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43783,16 +47933,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43803,11 +47953,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -43841,23 +47991,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
+@@ -43866,9 +48029,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+ ruby_init();
-+ return 0;
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43879,16 +48043,16 @@
- ;
- return 0;
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43899,11 +48063,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -43937,23 +48101,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 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_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
@@ -65483,3734 +44536,17748 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { 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
-- kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+ ruby_build=yes
+@@ -43962,9 +48139,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -43975,16 +48153,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -43995,11 +48173,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -44033,23 +48211,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
+@@ -44058,9 +48249,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44071,16 +48263,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44091,11 +48283,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -44129,23 +48321,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
+@@ -44154,9 +48359,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44167,16 +48373,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44187,11 +48393,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -44225,23 +48431,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
+@@ -44250,9 +48469,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44263,16 +48483,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44283,11 +48503,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -44321,23 +48541,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
+@@ -44346,9 +48579,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44359,16 +48593,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44379,11 +48613,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -44417,23 +48651,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
+@@ -44442,9 +48689,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44455,16 +48703,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44475,11 +48723,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -44513,23 +48761,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
+@@ -44538,9 +48799,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44551,16 +48813,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44571,11 +48833,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -44609,23 +48871,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
+@@ -44634,9 +48909,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44647,16 +48923,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44667,11 +48943,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -44705,23 +48981,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
+@@ -44730,9 +49019,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44743,16 +49033,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44763,11 +49053,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -44801,23 +49091,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
+@@ -44826,9 +49129,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44839,16 +49143,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -44859,11 +49163,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -44897,23 +49201,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
+@@ -44922,9 +49239,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-kde_cv_try_link_python_m_and_thread_and_db_special=no
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--CFLAGS="$kde_save_cflags"
--LIBS="$kde_save_libs"
--LDFLAGS="$kde_save_ldflags"
--
--fi
--
--
--if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -44935,16 +49253,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-- kde_python_link_found=yes
-- if test ! "m_and_thread_and_db_special" = normal; then
-- LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-- fi
--
--else
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-- and contact the authors to let them know about this problem" >&5
--echo "$as_me: WARNING: it seems, Python depends on another library.
-- Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-- and contact the authors to let them know about this problem" >&2;}
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -44978,11 +49296,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -45016,23 +49334,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
+@@ -45041,9 +49372,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45054,16 +49386,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45074,11 +49406,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -45112,23 +49444,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
+@@ -45137,9 +49482,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45150,16 +49496,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45170,11 +49516,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -45208,23 +49554,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
+@@ -45233,9 +49592,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45246,16 +49606,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45266,11 +49626,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -45304,23 +49664,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
+@@ -45329,9 +49702,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45342,16 +49716,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45362,11 +49736,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -45400,23 +49774,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
+@@ -45425,9 +49812,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45438,16 +49826,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45458,11 +49846,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -45496,23 +49884,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
+@@ -45521,9 +49922,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45534,16 +49936,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45554,11 +49956,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -45592,23 +49994,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
+@@ -45617,9 +50032,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45630,16 +50046,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45650,11 +50066,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -45688,23 +50104,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
+@@ -45713,9 +50142,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45726,16 +50156,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45746,11 +50176,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -45784,23 +50214,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
+@@ -45809,9 +50252,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45822,16 +50266,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45842,11 +50286,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -45880,23 +50324,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
+@@ -45905,9 +50362,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -45918,16 +50376,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -45938,11 +50396,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -45976,23 +50434,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
+@@ -46001,9 +50472,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -46014,16 +50486,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -46034,11 +50506,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -46072,23 +50544,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
+@@ -46097,9 +50582,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -46110,16 +50596,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -46130,11 +50616,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -46168,23 +50654,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
+@@ -46193,9 +50692,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -46206,16 +50706,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -46253,8 +50753,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for XOpenDisplay in -lXi" >&5
+-echo $ECHO_N "checking for XOpenDisplay in -lXi... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for XOpenDisplay in -lXi" >&5
++echo $ECHO_N "checking for XOpenDisplay in -lXi... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xi_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46267,39 +50767,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char XOpenDisplay ();
+ int
+ main ()
+ {
+-XOpenDisplay ();
++return XOpenDisplay ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -46308,14 +50821,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_Xi_XOpenDisplay=no
++ ac_cv_lib_Xi_XOpenDisplay=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XOpenDisplay" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xi_XOpenDisplay" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XOpenDisplay" >&5
++echo "${ECHO_T}$ac_cv_lib_Xi_XOpenDisplay" >&6; }
+ if test $ac_cv_lib_Xi_XOpenDisplay = yes; then
+ LIB_XINPUTEXT="-lXi"
+
+@@ -46332,16 +50846,15 @@
+
+
+ # Check for lcms
+-echo "$as_me:$LINENO: checking for lcms >= 1.12" >&5
+-echo $ECHO_N "checking for lcms >= 1.12... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lcms >= 1.12" >&5
++echo $ECHO_N "checking for lcms >= 1.12... $ECHO_C" >&6; }
+
+ have_lcms_header='no'
+
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
-
-+ruby_build=no
+- 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'
+@@ -46351,17 +50864,17 @@
+
+
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+-echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
++echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
+-echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
++echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46372,23 +50885,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
+@@ -46397,15 +50923,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_header_compiler=no
++ ac_header_compiler=no
fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
-+ echo "$as_me:$LINENO: result: $ruby_build" >&5
-+echo "${ECHO_T}$ruby_build" >&6
-+ if test "$ruby_build" = "no"; then
-+ RUBY_LIBDIR=""
-+ fi
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ # Is the header present?
+-echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
+-echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
++echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46414,8 +50941,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
+@@ -46439,9 +50971,10 @@
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -46465,25 +50998,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+-echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
++echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_lcms_lcms_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
+
+ fi
+ if test $ac_cv_header_lcms_lcms_h = yes; then
+@@ -46519,8 +51045,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
-
-- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
+- 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'
+@@ -46530,17 +51055,17 @@
+
+
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for lcms.h" >&5
+-echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for lcms.h" >&5
++echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking lcms.h usability" >&5
+-echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms.h usability" >&5
++echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46551,23 +51076,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
+@@ -46576,15 +51114,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking lcms.h presence" >&5
+-echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lcms.h presence" >&5
++echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46593,8 +51132,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
+@@ -46618,9 +51162,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -46644,25 +51189,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for lcms.h" >&5
+-echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lcms.h" >&5
++echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lcms_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_lcms_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
++echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
+
+ fi
+ if test $ac_cv_header_lcms_h = yes; then
+@@ -46700,13 +51238,13 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ HAVELCMS="yes"
+ LCMS_LIBS="-llcms"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ HAVELCMS="no"
+ LCMS_LIBS=""
+ DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
+@@ -46718,8 +51256,7 @@
+ if test ! "$LCMS_LIBS" = ""
+ then
+
-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -46747,23 +51284,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
+@@ -46772,8 +51322,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-lcms_version_114='yes'
++ lcms_version_114='yes'
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -46785,8 +51336,8 @@
+
+ # IM 6.1.3 changed the number of arguments to GetMagickInfoList
+
+-echo "$as_me:$LINENO: checking if GetMagickInfoList has only 2 arguments" >&5
+-echo $ECHO_N "checking if GetMagickInfoList has only 2 arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if GetMagickInfoList has only 2 arguments" >&5
++echo $ECHO_N "checking if GetMagickInfoList has only 2 arguments... $ECHO_C" >&6; }
+ CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags
+ CPPFLAGS="$LIBMAGICK_CPPFLAGS"
+
+@@ -46810,23 +51361,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
+@@ -46835,36 +51399,36 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-magick_info_list='no'
++ magick_info_list='no'
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags
+
+ if test "$magick_info_list" = 'yes'; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_OLD_GETMAGICKINFOLIST 1
+ _ACEOF
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+ # Check for kunittest
+-echo "$as_me:$LINENO: checking for kunittest" >&5
+-echo $ECHO_N "checking for kunittest... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kunittest" >&5
++echo $ECHO_N "checking for kunittest... $ECHO_C" >&6; }
+
+ have_kunittest_header="no"
+
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -46874,17 +51438,17 @@
+
+
+ if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
+-echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
++echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
++echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking kunittest/tester.h usability" >&5
+-echo $ECHO_N "checking kunittest/tester.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kunittest/tester.h usability" >&5
++echo $ECHO_N "checking kunittest/tester.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46895,23 +51459,36 @@
+ #include <kunittest/tester.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
+@@ -46920,15 +51497,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking kunittest/tester.h presence" >&5
+-echo $ECHO_N "checking kunittest/tester.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kunittest/tester.h presence" >&5
++echo $ECHO_N "checking kunittest/tester.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46937,8 +51515,13 @@
+ /* end confdefs.h. */
+ #include <kunittest/tester.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
+@@ -46962,9 +51545,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -46988,25 +51572,18 @@
+ echo "$as_me: WARNING: kunittest/tester.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
+-echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
++echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_kunittest_tester_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
++echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6; }
+
+ fi
+ if test $ac_cv_header_kunittest_tester_h = yes; then
+@@ -47041,28 +51618,27 @@
+ test -z "$GL_INCLUDE" && GL_INCLUDE=
+
+
+-# Check whether --with-gl or --without-gl was given.
++# Check whether --with-gl was given.
+ if test "${with_gl+set}" = set; then
+- withval="$with_gl"
+- gl_test=$withval
++ withval=$with_gl; gl_test=$withval
+ else
+ gl_test="yes"
+-fi;
++fi
++
+ if test "x$kde_use_qt_emb" = "xyes"; then
+ # GL and Qt Embedded is a no-go for now.
+ ac_cv_have_gl=no
+ elif test "x$gl_test" = xno; then
+ ac_cv_have_gl=no
+ else
+- echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GL" >&5
++echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
+ if test "${ac_cv_have_gl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
-
-+ fi # have ruby shared lib argument
-+ fi # have shared lib
-+ fi # have ruby header
-+ fi # have ruby
-+fi # compiling kross
+- 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'
+@@ -47098,23 +51674,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
+@@ -47123,8 +51712,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cv_have_gl="no"
++ ac_cv_have_gl="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -47140,8 +51730,8 @@
+ fi
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PYTHON 1
--_ACEOF
+ if test "$ac_cv_have_gl" = "no"; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ GL_LDFLAGS=""
+ GLINC=""
-+if test -n "$RUBY_LIBDIR"; then
-+ compile_kross_ruby_TRUE=
-+ compile_kross_ruby_FALSE='#'
-+else
-+ compile_kross_ruby_TRUE='#'
-+ compile_kross_ruby_FALSE=
+@@ -47161,8 +51751,8 @@
+ else
+ GLINC="-I$GL_INCLUDE"
+ fi
+- echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+
+ fi
+ fi
+@@ -47174,8 +51764,8 @@
+
+ # Check for powf.
+
+-echo "$as_me:$LINENO: checking for powf" >&5
+-echo $ECHO_N "checking for powf... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for powf" >&5
++echo $ECHO_N "checking for powf... $ECHO_C" >&6; }
+ if test "${ac_cv_func_powf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47202,52 +51792,59 @@
+
+ #undef powf
+
+-/* 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 powf ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_powf) || defined (__stub___powf)
++#if defined __stub_powf || defined __stub___powf
+ choke me
+-#else
+-char (*f) () = powf;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != powf;
++return powf ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47256,18 +51853,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_powf=no
++ ac_cv_func_powf=no
fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_powf" >&5
+-echo "${ECHO_T}$ac_cv_func_powf" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_powf" >&5
++echo "${ECHO_T}$ac_cv_func_powf" >&6; }
+ if test $ac_cv_func_powf = yes; then
+ have_powf="yes"
+ else
+- echo "$as_me:$LINENO: checking for powf in -lm" >&5
+-echo $ECHO_N "checking for powf in -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for powf in -lm" >&5
++echo $ECHO_N "checking for powf in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_powf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47280,39 +51878,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char powf ();
+ int
+ main ()
+ {
+-powf ();
++return powf ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47321,14 +51932,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cv_lib_m_powf=no
++ ac_cv_lib_m_powf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_m_powf" >&5
+-echo "${ECHO_T}$ac_cv_lib_m_powf" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_powf" >&5
++echo "${ECHO_T}$ac_cv_lib_m_powf" >&6; }
+ if test $ac_cv_lib_m_powf = yes; then
+ have_powf="yes"
+ else
+@@ -47350,8 +51962,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -47361,17 +51972,17 @@
+
+
+ if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
+-echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
++echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
++echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h usability" >&5
+-echo $ECHO_N "checking kjsembed/jsproxy_imp.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h usability" >&5
++echo $ECHO_N "checking kjsembed/jsproxy_imp.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -47382,23 +51993,36 @@
+ #include <kjsembed/jsproxy_imp.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
+@@ -47407,15 +52031,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h presence" >&5
+-echo $ECHO_N "checking kjsembed/jsproxy_imp.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h presence" >&5
++echo $ECHO_N "checking kjsembed/jsproxy_imp.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -47424,8 +52049,13 @@
+ /* end confdefs.h. */
+ #include <kjsembed/jsproxy_imp.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
+@@ -47449,9 +52079,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -47475,25 +52106,18 @@
+ echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
+-echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
++echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_kjsembed_jsproxy_imp_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
++echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6; }
+
+ fi
+ if test $ac_cv_header_kjsembed_jsproxy_imp_h = yes; then
+@@ -47522,8 +52146,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether round is declared" >&5
+-echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether round is declared" >&5
++echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_round+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47540,6 +52164,7 @@
+ {
+ #ifndef round
+ char *p = (char *) round;
++ return !p;
+ #endif
+
+ ;
+@@ -47547,23 +52172,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
+@@ -47572,12 +52210,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_have_decl_round=no
++ ac_cv_have_decl_round=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_round" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
++echo "${ECHO_T}$ac_cv_have_decl_round" >&6; }
+ if test $ac_cv_have_decl_round = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -47599,18 +52238,19 @@
+ for ac_header in ieeefp.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -47621,23 +52261,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
+@@ -47646,15 +52299,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -47663,8 +52317,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
+@@ -47688,9 +52347,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -47714,25 +52374,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -47749,9 +52403,9 @@
+ for ac_func in fabsl
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -47777,52 +52431,59 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+ _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
+@@ -47831,13 +52492,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -47849,8 +52512,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking for long double" >&5
+-echo $ECHO_N "checking for long double... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for long double" >&5
++echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
+ if test "${ac_cv_c_long_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47889,13 +52552,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
+@@ -47908,12 +52580,14 @@
+ ( exit $ac_status )
+ ac_cv_c_long_double=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
+-echo "${ECHO_T}$ac_cv_c_long_double" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
++echo "${ECHO_T}$ac_cv_c_long_double" >&6; }
+ if test $ac_cv_c_long_double = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -47938,8 +52612,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for isinf in -lm" >&5
+-echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for isinf in -lm" >&5
++echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_isinf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47952,39 +52626,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char isinf ();
+ int
+ main ()
+ {
+-isinf ();
++return isinf ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47993,14 +52680,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_m_isinf=no
++ ac_cv_lib_m_isinf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5
+-echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5
++echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6; }
+ if test $ac_cv_lib_m_isinf = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -48016,16 +52704,15 @@
+
+
+
+-echo "$as_me:$LINENO: checking for SQL support in QT" >&5
+-echo $ECHO_N "checking for SQL support in QT... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for SQL support in QT" >&5
++echo $ECHO_N "checking for SQL support in QT... $ECHO_C" >&6; }
+
+ LIBS_SAVE_KWSL="$LIBS"
+ CXXFLAGS_SAVE_KWSL="$CXXFLAGS"
+ CFLAGS_SAVE_KWSL="$CFLAGS"
+
+
-
- kde_save_LDFLAGS="$LDFLAGS"
- kde_save_LIBS="$LIBS"
- LDFLAGS="$LDFLAGS $all_libraries"
-@@ -48445,7 +72959,7 @@
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -48060,23 +52747,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
+@@ -48085,8 +52785,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_trycompile_kwsl_qtsql=no
++ ac_trycompile_kwsl_qtsql=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ CXXFLAGS="$CXXFLAGS_SAVE_KWSL"
+@@ -48101,13 +52802,13 @@
+ if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then
+ SQLDIR=sql
+
+- echo "$as_me:$LINENO: result: QT supports SQL - compile qtsqlmailmerge" >&5
+-echo "${ECHO_T}QT supports SQL - compile qtsqlmailmerge" >&6
++ { echo "$as_me:$LINENO: result: QT supports SQL - compile qtsqlmailmerge" >&5
++echo "${ECHO_T}QT supports SQL - compile qtsqlmailmerge" >&6; }
+ else
+ SQLDIR=
+
+- echo "$as_me:$LINENO: result: QT supports SQL -- qtsqlmailmerge will not be built" >&5
+-echo "${ECHO_T}QT supports SQL -- qtsqlmailmerge will not be built" >&6
++ { echo "$as_me:$LINENO: result: QT supports SQL -- qtsqlmailmerge will not be built" >&5
++echo "${ECHO_T}QT supports SQL -- qtsqlmailmerge will not be built" >&6; }
+ fi
+
+
+@@ -48181,7 +52882,6 @@
+
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -48192,10 +52892,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -48208,18 +52907,19 @@
+ for ac_header in kspell2/broker.h
do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -48230,23 +52930,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
+@@ -48255,15 +52968,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -48272,8 +52986,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
+@@ -48297,9 +53016,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -48323,25 +53043,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -48368,12 +53082,12 @@
+ _ACEOF
+
+ LIBKSPELL2="-lkspell2"
+- echo "$as_me:$LINENO: result: found in $ac_kspell2_includes" >&5
+-echo "${ECHO_T}found in $ac_kspell2_includes" >&6
++ { echo "$as_me:$LINENO: result: found in $ac_kspell2_includes" >&5
++echo "${ECHO_T}found in $ac_kspell2_includes" >&6; }
+ else
+ LIBKSPELL2=""
+- echo "$as_me:$LINENO: result: not found -- spell-checking will be disabled" >&5
+-echo "${ECHO_T}not found -- spell-checking will be disabled" >&6
++ { echo "$as_me:$LINENO: result: not found -- spell-checking will be disabled" >&5
++echo "${ECHO_T}not found -- spell-checking will be disabled" >&6; }
+ fi
+
+ ac_ext=c
+@@ -48383,13 +53097,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-# Check whether --enable-scripting or --disable-scripting was given.
++# Check whether --enable-scripting was given.
+ if test "${enable_scripting+set}" = set; then
+- enableval="$enable_scripting"
+- compile_kross=$enableval
++ enableval=$enable_scripting; compile_kross=$enableval
+ else
+ compile_kross=yes
+-fi;
++fi
++
+
+
+ if test "x$compile_kross" = "xyes"; then
+@@ -48418,8 +53132,8 @@
+ version=""2.4""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -48428,7 +53142,7 @@
+ do
for j in Python.h;
do
-- echo "configure: 48448: $i/$j" >&5
-+ echo "configure: 72962: $i/$j" >&5
+- echo "configure: 48431: $i/$j" >&5
++ echo "configure: 53145: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48461,7 +72975,7 @@
+@@ -48444,7 +53158,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48464: $i/$j" >&5
-+ echo "configure: 72978: $i/$j" >&5
+- echo "configure: 48447: $i/$j" >&5
++ echo "configure: 53161: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48485,7 +72999,7 @@
+@@ -48468,7 +53182,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48488: $i/$j" >&5
-+ echo "configure: 73002: $i/$j" >&5
+- echo "configure: 48471: $i/$j" >&5
++ echo "configure: 53185: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48501,7 +73015,7 @@
+@@ -48484,7 +53198,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48504: $i/$j" >&5
-+ echo "configure: 73018: $i/$j" >&5
+- echo "configure: 48487: $i/$j" >&5
++ echo "configure: 53201: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48517,7 +73031,7 @@
+@@ -48500,7 +53214,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48520: $i/$j" >&5
-+ echo "configure: 73034: $i/$j" >&5
+- echo "configure: 48503: $i/$j" >&5
++ echo "configure: 53217: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48545,7 +73059,7 @@
+@@ -48528,7 +53242,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48548: $i/$j" >&5
-+ echo "configure: 73062: $i/$j" >&5
+- echo "configure: 48531: $i/$j" >&5
++ echo "configure: 53245: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48589,7 +73103,7 @@
+@@ -48544,8 +53258,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -48562,8 +53276,8 @@
+ version=""2.3""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -48572,7 +53286,7 @@
do
for j in Python.h;
do
-- echo "configure: 48592: $i/$j" >&5
-+ echo "configure: 73106: $i/$j" >&5
+- echo "configure: 48575: $i/$j" >&5
++ echo "configure: 53289: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48605,7 +73119,7 @@
+@@ -48588,7 +53302,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48608: $i/$j" >&5
-+ echo "configure: 73122: $i/$j" >&5
+- echo "configure: 48591: $i/$j" >&5
++ echo "configure: 53305: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48629,7 +73143,7 @@
+@@ -48612,7 +53326,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48632: $i/$j" >&5
-+ echo "configure: 73146: $i/$j" >&5
+- echo "configure: 48615: $i/$j" >&5
++ echo "configure: 53329: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48645,7 +73159,7 @@
+@@ -48628,7 +53342,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48648: $i/$j" >&5
-+ echo "configure: 73162: $i/$j" >&5
+- echo "configure: 48631: $i/$j" >&5
++ echo "configure: 53345: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48661,7 +73175,7 @@
+@@ -48644,7 +53358,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48664: $i/$j" >&5
-+ echo "configure: 73178: $i/$j" >&5
+- echo "configure: 48647: $i/$j" >&5
++ echo "configure: 53361: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48689,7 +73203,7 @@
+@@ -48672,7 +53386,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48692: $i/$j" >&5
-+ echo "configure: 73206: $i/$j" >&5
+- echo "configure: 48675: $i/$j" >&5
++ echo "configure: 53389: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48733,7 +73247,7 @@
+@@ -48688,8 +53402,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -48706,8 +53420,8 @@
+ version=""2.2""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -48716,7 +53430,7 @@
do
for j in Python.h;
do
-- echo "configure: 48736: $i/$j" >&5
-+ echo "configure: 73250: $i/$j" >&5
+- echo "configure: 48719: $i/$j" >&5
++ echo "configure: 53433: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48749,7 +73263,7 @@
+@@ -48732,7 +53446,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48752: $i/$j" >&5
-+ echo "configure: 73266: $i/$j" >&5
+- echo "configure: 48735: $i/$j" >&5
++ echo "configure: 53449: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48773,7 +73287,7 @@
+@@ -48756,7 +53470,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48776: $i/$j" >&5
-+ echo "configure: 73290: $i/$j" >&5
+- echo "configure: 48759: $i/$j" >&5
++ echo "configure: 53473: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48789,7 +73303,7 @@
+@@ -48772,7 +53486,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48792: $i/$j" >&5
-+ echo "configure: 73306: $i/$j" >&5
+- echo "configure: 48775: $i/$j" >&5
++ echo "configure: 53489: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48805,7 +73319,7 @@
+@@ -48788,7 +53502,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48808: $i/$j" >&5
-+ echo "configure: 73322: $i/$j" >&5
+- echo "configure: 48791: $i/$j" >&5
++ echo "configure: 53505: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48833,7 +73347,7 @@
+@@ -48816,7 +53530,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48836: $i/$j" >&5
-+ echo "configure: 73350: $i/$j" >&5
+- echo "configure: 48819: $i/$j" >&5
++ echo "configure: 53533: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48877,7 +73391,7 @@
+@@ -48832,8 +53546,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -48850,8 +53564,8 @@
+ version=""2.1""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -48860,7 +53574,7 @@
do
for j in Python.h;
do
-- echo "configure: 48880: $i/$j" >&5
-+ echo "configure: 73394: $i/$j" >&5
+- echo "configure: 48863: $i/$j" >&5
++ echo "configure: 53577: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48893,7 +73407,7 @@
+@@ -48876,7 +53590,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48896: $i/$j" >&5
-+ echo "configure: 73410: $i/$j" >&5
+- echo "configure: 48879: $i/$j" >&5
++ echo "configure: 53593: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48917,7 +73431,7 @@
+@@ -48900,7 +53614,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48920: $i/$j" >&5
-+ echo "configure: 73434: $i/$j" >&5
+- echo "configure: 48903: $i/$j" >&5
++ echo "configure: 53617: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48933,7 +73447,7 @@
+@@ -48916,7 +53630,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48936: $i/$j" >&5
-+ echo "configure: 73450: $i/$j" >&5
+- echo "configure: 48919: $i/$j" >&5
++ echo "configure: 53633: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48949,7 +73463,7 @@
+@@ -48932,7 +53646,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48952: $i/$j" >&5
-+ echo "configure: 73466: $i/$j" >&5
+- echo "configure: 48935: $i/$j" >&5
++ echo "configure: 53649: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48977,7 +73491,7 @@
+@@ -48960,7 +53674,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48980: $i/$j" >&5
-+ echo "configure: 73494: $i/$j" >&5
+- echo "configure: 48963: $i/$j" >&5
++ echo "configure: 53677: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -49021,7 +73535,7 @@
+@@ -48976,8 +53690,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -48994,8 +53708,8 @@
+ version=""2.0""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -49004,7 +53718,7 @@
do
for j in Python.h;
do
-- echo "configure: 49024: $i/$j" >&5
-+ echo "configure: 73538: $i/$j" >&5
+- echo "configure: 49007: $i/$j" >&5
++ echo "configure: 53721: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -49037,7 +73551,7 @@
+@@ -49020,7 +53734,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 49040: $i/$j" >&5
-+ echo "configure: 73554: $i/$j" >&5
+- echo "configure: 49023: $i/$j" >&5
++ echo "configure: 53737: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -49061,7 +73575,7 @@
+@@ -49044,7 +53758,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 49064: $i/$j" >&5
-+ echo "configure: 73578: $i/$j" >&5
+- echo "configure: 49047: $i/$j" >&5
++ echo "configure: 53761: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49077,7 +73591,7 @@
+@@ -49060,7 +53774,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 49080: $i/$j" >&5
-+ echo "configure: 73594: $i/$j" >&5
+- echo "configure: 49063: $i/$j" >&5
++ echo "configure: 53777: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49093,7 +73607,7 @@
+@@ -49076,7 +53790,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 49096: $i/$j" >&5
-+ echo "configure: 73610: $i/$j" >&5
+- echo "configure: 49079: $i/$j" >&5
++ echo "configure: 53793: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49121,7 +73635,7 @@
+@@ -49104,7 +53818,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 49124: $i/$j" >&5
-+ echo "configure: 73638: $i/$j" >&5
+- echo "configure: 49107: $i/$j" >&5
++ echo "configure: 53821: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -49165,7 +73679,7 @@
+@@ -49120,8 +53834,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -49138,8 +53852,8 @@
+ version=""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -49148,7 +53862,7 @@
do
for j in Python.h;
do
-- echo "configure: 49168: $i/$j" >&5
-+ echo "configure: 73682: $i/$j" >&5
+- echo "configure: 49151: $i/$j" >&5
++ echo "configure: 53865: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -49181,7 +73695,7 @@
+@@ -49164,7 +53878,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 49184: $i/$j" >&5
-+ echo "configure: 73698: $i/$j" >&5
+- echo "configure: 49167: $i/$j" >&5
++ echo "configure: 53881: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -49205,7 +73719,7 @@
+@@ -49188,7 +53902,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 49208: $i/$j" >&5
-+ echo "configure: 73722: $i/$j" >&5
+- echo "configure: 49191: $i/$j" >&5
++ echo "configure: 53905: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49221,7 +73735,7 @@
+@@ -49204,7 +53918,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 49224: $i/$j" >&5
-+ echo "configure: 73738: $i/$j" >&5
+- echo "configure: 49207: $i/$j" >&5
++ echo "configure: 53921: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49237,7 +73751,7 @@
+@@ -49220,7 +53934,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 49240: $i/$j" >&5
-+ echo "configure: 73754: $i/$j" >&5
+- echo "configure: 49223: $i/$j" >&5
++ echo "configure: 53937: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -49265,7 +73779,7 @@
+@@ -49248,7 +53962,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 49268: $i/$j" >&5
-+ echo "configure: 73782: $i/$j" >&5
+- echo "configure: 49251: $i/$j" >&5
++ echo "configure: 53965: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -57287,6 +81801,22 @@
+@@ -49264,8 +53978,8 @@
+ PYTHONMODDIR=$python_moddir
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
-+if test "x$koffice_1_5_1_SUBDIR_included" = xyes; then
-+ koffice_1_5_1_SUBDIR_included_TRUE=
-+ koffice_1_5_1_SUBDIR_included_FALSE='#'
-+else
-+ koffice_1_5_1_SUBDIR_included_TRUE='#'
-+ koffice_1_5_1_SUBDIR_included_FALSE=
-+fi
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -49278,11 +53992,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -49316,23 +54030,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
+@@ -49341,9 +54068,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+if test "x$koffice_1_5_1_SUBDIR_included" = xyes; then
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49354,16 +54082,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49374,11 +54102,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -49412,23 +54140,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
+@@ -49437,9 +54178,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49450,16 +54192,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49470,11 +54212,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -49508,23 +54250,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
+@@ -49533,9 +54288,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+subdirs="$subdirs koffice-1.5.1"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49546,16 +54302,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49566,11 +54322,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -49604,23 +54360,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
+@@ -49629,9 +54398,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49642,16 +54412,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49662,11 +54432,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -49700,23 +54470,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
+@@ -49725,9 +54508,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49738,16 +54522,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49758,11 +54542,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -49796,23 +54580,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
+@@ -49821,9 +54618,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
- if test "x$koshell_SUBDIR_included" = xyes; then
- koshell_SUBDIR_included_TRUE=
- koshell_SUBDIR_included_FALSE='#'
-@@ -58625,6 +83155,259 @@
- compile_plugin_KUGAR_FALSE=
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49834,16 +54632,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
fi
-+echo "$as_me:$LINENO: checking for filters to be compiled" >&5
-+echo $ECHO_N "checking for filters to be compiled... $ECHO_C" >&6
+@@ -49854,11 +54652,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -49892,23 +54690,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
+@@ -49917,9 +54728,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -49930,16 +54742,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -49950,11 +54762,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -49988,23 +54800,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
+@@ -50013,9 +54838,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50026,16 +54852,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50046,11 +54872,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -50084,23 +54910,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
+@@ -50109,9 +54948,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+# first check which main apllication we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ kword) COMPILE_FILTER_KWORD="$args " ;;
-+ kspread) COMPILE_FILTER_KSPREAD="$args " ;;
-+ kchart) COMPILE_FILTER_KCHART="$args " ;;
-+ karbon) COMPILE_FILTER_KARBON="$args " ;;
-+ kpresenter) COMPILE_FILTER_KPRESENTER="$args " ;;
-+ kformula) COMPILE_FILTER_KFORMULA="$args " ;;
-+ kugar) COMPILE_FILTER_KUGAR="$args " ;;
-+ krita) COMPILE_FILTER_KRITA="$args " ;;
-+ kivio) COMPILE_FILTER_KIVIO="$args " ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50122,16 +54962,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50142,11 +54982,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -50180,23 +55020,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
+@@ -50205,9 +55058,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ kword) COMPILE_FILTER_KWORD= ;;
-+ kspread) COMPILE_FILTER_KSPREAD= ;;
-+ kchart) COMPILE_FILTER_KCHART= ;;
-+ karbon) COMPILE_FILTER_KARBON= ;;
-+ kpresenter) COMPILE_FILTER_KPRESENTER= ;;
-+ kformula) COMPILE_FILTER_KFORMULA= ;;
-+ kugar) COMPILE_FILTER_KUGAR= ;;
-+ krita) COMPILE_FILTER_KRITA= ;;
-+ kivio) COMPILE_FILTER_KIVIO= ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50218,16 +55072,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50238,11 +55092,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -50276,23 +55130,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
+@@ -50301,9 +55168,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
-+USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR"
-+echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILE" >&5
-+echo "${ECHO_T}$USERFEEDBACKCOMPILE" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50314,16 +55182,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50334,11 +55202,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -50372,23 +55240,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
+@@ -50397,9 +55278,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50410,16 +55292,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50430,11 +55312,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -50468,23 +55350,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
+@@ -50493,9 +55388,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50506,16 +55402,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -50548,11 +55444,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -50586,23 +55482,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
+@@ -50611,9 +55520,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KWORD"; then
-+ compile_filter_KWORD_TRUE=
-+ compile_filter_KWORD_FALSE='#'
-+else
-+ compile_filter_KWORD_TRUE='#'
-+ compile_filter_KWORD_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50624,16 +55534,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50644,11 +55554,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -50682,23 +55592,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
+@@ -50707,9 +55630,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50720,16 +55644,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50740,11 +55664,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -50778,23 +55702,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
+@@ -50803,9 +55740,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50816,16 +55754,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50836,11 +55774,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -50874,23 +55812,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
+@@ -50899,9 +55850,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KSPREAD"; then
-+ compile_filter_KSPREAD_TRUE=
-+ compile_filter_KSPREAD_FALSE='#'
-+else
-+ compile_filter_KSPREAD_TRUE='#'
-+ compile_filter_KSPREAD_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -50912,16 +55864,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -50932,11 +55884,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -50970,23 +55922,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
+@@ -50995,9 +55960,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51008,16 +55974,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51028,11 +55994,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -51066,23 +56032,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
+@@ -51091,9 +56070,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51104,16 +56084,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51124,11 +56104,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -51162,23 +56142,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
+@@ -51187,9 +56180,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KCHART"; then
-+ compile_filter_KCHART_TRUE=
-+ compile_filter_KCHART_FALSE='#'
-+else
-+ compile_filter_KCHART_TRUE='#'
-+ compile_filter_KCHART_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51200,16 +56194,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51220,11 +56214,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -51258,23 +56252,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
+@@ -51283,9 +56290,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51296,16 +56304,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51316,11 +56324,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -51354,23 +56362,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
+@@ -51379,9 +56400,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51392,16 +56414,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51412,11 +56434,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -51450,23 +56472,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
+@@ -51475,9 +56510,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KARBON"; then
-+ compile_filter_KARBON_TRUE=
-+ compile_filter_KARBON_FALSE='#'
-+else
-+ compile_filter_KARBON_TRUE='#'
-+ compile_filter_KARBON_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51488,16 +56524,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51508,11 +56544,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -51546,23 +56582,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
+@@ -51571,9 +56620,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51584,16 +56634,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51604,11 +56654,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -51642,23 +56692,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
+@@ -51667,9 +56730,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51680,16 +56744,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51700,11 +56764,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -51738,23 +56802,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
+@@ -51763,9 +56840,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KPRESENTER"; then
-+ compile_filter_KPRESENTER_TRUE=
-+ compile_filter_KPRESENTER_FALSE='#'
-+else
-+ compile_filter_KPRESENTER_TRUE='#'
-+ compile_filter_KPRESENTER_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51776,16 +56854,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -51819,11 +56897,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -51857,23 +56935,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
+@@ -51882,9 +56973,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51895,16 +56987,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -51915,11 +57007,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -51953,23 +57045,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
+@@ -51978,9 +57083,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -51991,16 +57097,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52011,11 +57117,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -52049,23 +57155,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
+@@ -52074,9 +57193,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KFORMULA"; then
-+ compile_filter_KFORMULA_TRUE=
-+ compile_filter_KFORMULA_FALSE='#'
-+else
-+ compile_filter_KFORMULA_TRUE='#'
-+ compile_filter_KFORMULA_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52087,16 +57207,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52107,11 +57227,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -52145,23 +57265,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
+@@ -52170,9 +57303,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52183,16 +57317,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52203,11 +57337,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -52241,23 +57375,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
+@@ -52266,9 +57413,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52279,16 +57427,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52299,11 +57447,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -52337,23 +57485,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
+@@ -52362,9 +57523,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KUGAR"; then
-+ compile_filter_KUGAR_TRUE=
-+ compile_filter_KUGAR_FALSE='#'
-+else
-+ compile_filter_KUGAR_TRUE='#'
-+ compile_filter_KUGAR_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52375,16 +57537,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52395,11 +57557,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -52433,23 +57595,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
+@@ -52458,9 +57633,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52471,16 +57647,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52491,11 +57667,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -52529,23 +57705,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
+@@ -52554,9 +57743,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52567,16 +57757,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52587,11 +57777,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -52625,23 +57815,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
+@@ -52650,9 +57853,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KRITA"; then
-+ compile_filter_KRITA_TRUE=
-+ compile_filter_KRITA_FALSE='#'
-+else
-+ compile_filter_KRITA_TRUE='#'
-+ compile_filter_KRITA_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52663,16 +57867,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52683,11 +57887,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -52721,23 +57925,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
+@@ -52746,9 +57963,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52759,16 +57977,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52779,11 +57997,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -52817,23 +58035,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
+@@ -52842,9 +58073,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52855,16 +58087,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52875,11 +58107,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -52913,23 +58145,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
+@@ -52938,9 +58183,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+if test -n "$COMPILE_FILTER_KIVIO"; then
-+ compile_filter_KIVIO_TRUE=
-+ compile_filter_KIVIO_FALSE='#'
-+else
-+ compile_filter_KIVIO_TRUE='#'
-+ compile_filter_KIVIO_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -52951,16 +58197,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -52971,11 +58217,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -53009,23 +58255,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
+@@ -53034,9 +58293,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53047,16 +58307,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -53090,11 +58350,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -53128,23 +58388,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
+@@ -53153,9 +58426,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53166,16 +58440,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53186,11 +58460,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -53224,23 +58498,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
+@@ -53249,9 +58536,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53262,16 +58550,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53282,11 +58570,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -53320,23 +58608,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
+@@ -53345,9 +58646,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+# first check which main apllication we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ kugar) COMPILE_PLUGIN_KUGAR="$args " ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53358,16 +58660,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53378,11 +58680,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -53416,23 +58718,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
+@@ -53441,9 +58756,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ kugar) COMPILE_PLUGIN_KUGAR= ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53454,16 +58770,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53474,11 +58790,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -53512,23 +58828,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
+@@ -53537,9 +58866,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53550,16 +58880,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53570,11 +58900,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -53608,23 +58938,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
+@@ -53633,9 +58976,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53646,16 +58990,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53666,11 +59010,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -53704,23 +59048,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
+@@ -53729,9 +59086,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+if test -n "$COMPILE_PLUGIN_KUGAR"; then
-+ compile_plugin_KUGAR_TRUE=
-+ compile_plugin_KUGAR_FALSE='#'
-+else
-+ compile_plugin_KUGAR_TRUE='#'
-+ compile_plugin_KUGAR_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53742,16 +59100,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53762,11 +59120,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -53800,23 +59158,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
+@@ -53825,9 +59196,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53838,16 +59210,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53858,11 +59230,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -53896,23 +59268,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
+@@ -53921,9 +59306,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -53934,16 +59320,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -53954,11 +59340,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -53992,23 +59378,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
+@@ -54017,9 +59416,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
-+echo "$as_me:$LINENO: checking whether only Kexi is being built" >&5
-+echo $ECHO_N "checking whether only Kexi is being built... $ECHO_C" >&6
-+KEXI_ONLY=yes
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ lib) ;;
-+ kexi) ;;
-+ *) if test -d $srcdir/$args ; then
-+ KEXI_ONLY=no
-+ fi
-+ ;;
-+ esac
-+done
-+echo "$as_me:$LINENO: result: $KEXI_ONLY" >&5
-+echo "${ECHO_T}$KEXI_ONLY" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54030,16 +59430,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54050,11 +59450,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -54088,23 +59488,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
+@@ -54113,9 +59526,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54126,16 +59540,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54146,11 +59560,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -54184,23 +59598,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
+@@ -54209,9 +59636,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+if test "$KEXI_ONLY" = "yes" ; then
-+ compile_kexionly_TRUE=
-+ compile_kexionly_FALSE='#'
-+else
-+ compile_kexionly_TRUE='#'
-+ compile_kexionly_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54222,16 +59650,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54242,11 +59670,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -54280,23 +59708,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
+@@ -54305,9 +59746,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54318,16 +59760,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -54361,11 +59803,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -54399,23 +59841,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
+@@ -54424,9 +59879,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+echo "$as_me:$LINENO: checking whether kopainter should be compiled" >&5
-+echo $ECHO_N "checking whether kopainter should be compiled... $ECHO_C" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54437,16 +59893,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54457,11 +59913,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -54495,23 +59951,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
+@@ -54520,9 +59989,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54533,16 +60003,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54553,11 +60023,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -54591,23 +60061,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
+@@ -54616,9 +60099,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+# first check which main application we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ krita) COMPILE_LIB_FOR_KRITA="$args " ;;
-+ karbon) COMPILE_LIB_FOR_KARBON="$args " ;;
-+ kivio) COMPILE_LIB_FOR_KIVIO="$args " ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54629,16 +60113,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54649,11 +60133,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -54687,23 +60171,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
+@@ -54712,9 +60209,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ krita) COMPILE_LIB_FOR_KRITA= ;;
-+ karbon) COMPILE_LIB_FOR_KARBON= ;;
-+ kivio) COMPILE_LIB_FOR_KIVIO= ;;
-+ esac
-+done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54725,16 +60223,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54745,11 +60243,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -54783,23 +60281,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
+@@ -54808,9 +60319,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
-+if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO" ; then
-+ USERFEEDBACKCOMPILELIB="yes"
-+else
-+ USERFEEDBACKCOMPILELIB="no"
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54821,16 +60333,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54841,11 +60353,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -54879,23 +60391,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
+@@ -54904,9 +60429,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
-+echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILELIB" >&5
-+echo "${ECHO_T}$USERFEEDBACKCOMPILELIB" >&6
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -54917,16 +60443,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -54937,11 +60463,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -54975,23 +60501,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
+@@ -55000,9 +60539,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55013,16 +60553,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55033,11 +60573,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -55071,23 +60611,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
+@@ -55096,9 +60649,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55109,16 +60663,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55129,11 +60683,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -55167,23 +60721,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
+@@ -55192,9 +60759,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+if test "$USERFEEDBACKCOMPILELIB" = "yes" ; then
-+ compile_lib_KOPAINTER_TRUE=
-+ compile_lib_KOPAINTER_FALSE='#'
-+else
-+ compile_lib_KOPAINTER_TRUE='#'
-+ compile_lib_KOPAINTER_FALSE=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55205,16 +60773,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55225,11 +60793,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -55263,23 +60831,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
+@@ -55288,9 +60869,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55301,16 +60883,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55321,11 +60903,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -55359,23 +60941,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
+@@ -55384,9 +60979,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
- if test -s $srcdir/inst-apps ; then
- SUBDIRLIST=`cat $srcdir/inst-apps`
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55397,16 +60993,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
else
-@@ -58795,6 +83578,13 @@
- LTLIBOBJS=$ac_ltlibobjs
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- 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
-@@ -58830,10 +83620,164 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+@@ -55417,11 +61013,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
fi
--if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
-+if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_imagemagick_filter_TRUE}" && test -z "${include_imagemagick_filter_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_imagemagick_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_imagemagick_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${need_kde32_compatibility_TRUE}" && test -z "${need_kde32_compatibility_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"need_kde32_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"need_kde32_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${need_kde33_compatibility_TRUE}" && test -z "${need_kde33_compatibility_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"need_kde33_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"need_kde33_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${need_kde34_compatibility_TRUE}" && test -z "${need_kde34_compatibility_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"need_kde34_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"need_kde34_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${need_kde351_compatibility_TRUE}" && test -z "${need_kde351_compatibility_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"need_kde351_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"need_kde351_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${need_kde31_compatibility_TRUE}" && test -z "${need_kde31_compatibility_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"need_kde31_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"need_kde31_compatibility\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_openexr_TRUE}" && test -z "${have_openexr_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_openexr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_openexr\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_tiff_TRUE}" && test -z "${have_tiff_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_tiff\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_tiff\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_png_TRUE}" && test -z "${have_png_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_png\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_png\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_jpeg_TRUE}" && test -z "${have_jpeg_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_jpeg\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_jpeg\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_exif_TRUE}" && test -z "${have_exif_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_exif\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_exif\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_jpeg_filter_TRUE}" && test -z "${include_jpeg_filter_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_jpeg_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_jpeg_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_tiff_filter_TRUE}" && test -z "${include_tiff_filter_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_tiff_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_tiff_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_wv2_msword_filter_TRUE}" && test -z "${include_wv2_msword_filter_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_wv2_msword_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_wv2_msword_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_wpd_filter_TRUE}" && test -z "${include_wpd_filter_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_wpd_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_wpd_filter\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_XSLTFILTERS_TRUE}" && test -z "${include_XSLTFILTERS_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_XSLTFILTERS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_XSLTFILTERS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${have_readline_TRUE}" && test -z "${have_readline_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"have_readline\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"have_readline\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_mysql_plugin_TRUE}" && test -z "${compile_mysql_plugin_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_mysql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_mysql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_pgsql_plugin_TRUE}" && test -z "${compile_pgsql_plugin_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_pgsql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_pgsql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_pgsql_plugin_TRUE}" && test -z "${compile_pgsql_plugin_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_pgsql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_pgsql_plugin\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${use_kexifeedback_TRUE}" && test -z "${use_kexifeedback_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"use_kexifeedback\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"use_kexifeedback\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_kexi_reports_plugin_TRUE}" && test -z "${compile_kexi_reports_plugin_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_kexi_reports_plugin\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"include_ARTS\" was never defined.
-+echo "$as_me: error: conditional \"compile_kexi_reports_plugin\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -55455,23 +61051,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
+@@ -55480,9 +61089,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
fi
-@@ -59033,6 +83977,48 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55493,16 +61103,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
fi
-+if test -z "${include_kunittest_tests_TRUE}" && test -z "${include_kunittest_tests_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_kunittest_tests\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_kunittest_tests\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${use_kjsembed_TRUE}" && test -z "${use_kjsembed_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"use_kjsembed\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"use_kjsembed\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${include_sql_TRUE}" && test -z "${include_sql_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"include_sql\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"include_sql\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_kross_TRUE}" && test -z "${compile_kross_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_kross\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_kross\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_kross_python_TRUE}" && test -z "${compile_kross_python_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_kross_python\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_kross_python\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_kross_ruby_TRUE}" && test -z "${compile_kross_ruby_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_kross_ruby\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_kross_ruby\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${lib_SUBDIR_included_TRUE}" && test -z "${lib_SUBDIR_included_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"lib_SUBDIR_included\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -59103,6 +84089,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+
+@@ -55513,11 +61123,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
fi
-+if test -z "${koffice_1_5_1_SUBDIR_included_TRUE}" && test -z "${koffice_1_5_1_SUBDIR_included_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"koffice_1_5_1_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"koffice_1_5_1_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${koshell_SUBDIR_included_TRUE}" && test -z "${koshell_SUBDIR_included_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"koshell_SUBDIR_included\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -59285,6 +84278,90 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -55551,23 +61161,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
+@@ -55576,9 +61199,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
fi
-+if test -z "${compile_filter_KWORD_TRUE}" && test -z "${compile_filter_KWORD_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KWORD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KWORD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KSPREAD_TRUE}" && test -z "${compile_filter_KSPREAD_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KSPREAD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KSPREAD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KCHART_TRUE}" && test -z "${compile_filter_KCHART_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KCHART\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KCHART\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KARBON_TRUE}" && test -z "${compile_filter_KARBON_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KARBON\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KARBON\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KPRESENTER_TRUE}" && test -z "${compile_filter_KPRESENTER_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KPRESENTER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KPRESENTER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KFORMULA_TRUE}" && test -z "${compile_filter_KFORMULA_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KFORMULA\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KFORMULA\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KUGAR_TRUE}" && test -z "${compile_filter_KUGAR_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KUGAR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KUGAR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KRITA_TRUE}" && test -z "${compile_filter_KRITA_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KRITA\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KRITA\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_filter_KIVIO_TRUE}" && test -z "${compile_filter_KIVIO_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_filter_KIVIO\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_filter_KIVIO\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_plugin_KUGAR_TRUE}" && test -z "${compile_plugin_KUGAR_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_plugin_KUGAR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_plugin_KUGAR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_kexionly_TRUE}" && test -z "${compile_kexionly_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_kexionly\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_kexionly\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${compile_lib_KOPAINTER_TRUE}" && test -z "${compile_lib_KOPAINTER_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"compile_lib_KOPAINTER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"compile_lib_KOPAINTER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${compile_kexionly_TRUE}" && test -z "${compile_kexionly_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"compile_kexionly\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -60367,6 +85444,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at KDECONFIG@,$KDECONFIG,;t t
- s, at kde_libs_prefix@,$kde_libs_prefix,;t t
- s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -60707,6 +85787,9 @@
- s, at kformula_SUBDIR_included_FALSE@,$kformula_SUBDIR_included_FALSE,;t t
- s, at kivio_SUBDIR_included_TRUE@,$kivio_SUBDIR_included_TRUE,;t t
- s, at kivio_SUBDIR_included_FALSE@,$kivio_SUBDIR_included_FALSE,;t t
-+s, at koffice_1_5_1_SUBDIR_included_TRUE@,$koffice_1_5_1_SUBDIR_included_TRUE,;t t
-+s, at koffice_1_5_1_SUBDIR_included_FALSE@,$koffice_1_5_1_SUBDIR_included_FALSE,;t t
-+s, at subdirs@,$subdirs,;t t
- s, at koshell_SUBDIR_included_TRUE@,$koshell_SUBDIR_included_TRUE,;t t
- s, at koshell_SUBDIR_included_FALSE@,$koshell_SUBDIR_included_FALSE,;t t
- s, at kounavail_SUBDIR_included_TRUE@,$kounavail_SUBDIR_included_TRUE,;t t
-@@ -61486,6 +86569,387 @@
- $ac_cs_success || { (exit 1); exit 1; }
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55589,16 +61213,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -55632,11 +61256,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
fi
-+#
-+# CONFIG_SUBDIRS section.
-+#
-+if test "$no_recursion" != yes; then
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -55670,23 +61294,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
+@@ -55695,9 +61332,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+
-+ # Remove --cache-file and --srcdir arguments so they do not pile up.
-+ ac_sub_configure_args=
-+ ac_prev=
-+ for ac_arg in $ac_configure_args; do
-+ if test -n "$ac_prev"; then
-+ ac_prev=
-+ continue
-+ fi
-+ case $ac_arg in
-+ -cache-file | --cache-file | --cache-fil | --cache-fi \
-+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+ ac_prev=cache_file ;;
-+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-+ | --c=*)
-+ ;;
-+ --config-cache | -C)
-+ ;;
-+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+ ac_prev=srcdir ;;
-+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+ ;;
-+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+ ac_prev=prefix ;;
-+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+ ;;
-+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-+ esac
-+ done
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55708,16 +61346,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55728,11 +61366,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -55766,23 +61404,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
+@@ -55791,9 +61442,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+
-+ # Always prepend --prefix to ensure using the same prefix
-+ # in subdir configurations.
-+ ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55804,16 +61456,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55824,11 +61476,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -55862,23 +61514,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
+@@ -55887,9 +61552,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+
-+ ac_popdir=`pwd`
-+ for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55900,16 +61566,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -55920,11 +61586,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -55958,23 +61624,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
+@@ -55983,9 +61662,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+
-+ # Do not complain, so a configure script can configure whichever
-+ # parts of a large source tree are present.
-+ test -d $srcdir/$ac_dir || continue
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -55996,16 +61676,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56016,11 +61696,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -56054,23 +61734,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
+@@ -56079,9 +61772,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+
-+ { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-+echo "$as_me: configuring in $ac_dir" >&6;}
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56092,16 +61786,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56112,11 +61806,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -56150,23 +61844,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
+@@ -56175,9 +61882,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+
-+ ac_builddir=.
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56188,16 +61896,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56208,11 +61916,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -56246,23 +61954,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
+@@ -56271,9 +61992,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56284,16 +62006,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56304,11 +62026,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -56342,23 +62064,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
+@@ -56367,9 +62102,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56380,16 +62116,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56400,11 +62136,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -56438,23 +62174,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
+@@ -56463,9 +62212,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56476,16 +62226,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56496,11 +62246,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -56534,23 +62284,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
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
++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
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -56559,9 +62322,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56572,16 +62336,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56592,11 +62356,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -56630,23 +62394,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
+@@ -56655,9 +62432,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56668,16 +62446,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -56688,11 +62466,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -56726,23 +62504,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
+@@ -56751,9 +62542,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+
-+ cd $ac_dir
-+
-+ # Check for guested configure; otherwise get Cygnus style configure.
-+ if test -f $ac_srcdir/configure.gnu; then
-+ ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-+ elif test -f $ac_srcdir/configure; then
-+ ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-+ elif test -f $ac_srcdir/configure.in; then
-+ ac_sub_configure=$ac_configure
-+ else
-+ { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-+ ac_sub_configure=
-+ fi
-+
-+ # The recursion is here.
-+ if test -n "$ac_sub_configure"; then
-+ # Make the cache file name correct relative to the subdirectory.
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-+ *) # Relative path.
-+ ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-+ esac
-+
-+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-+ # The eval makes quoting arguments work.
-+ eval $ac_sub_configure $ac_sub_configure_args \
-+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ cd "$ac_popdir"
-+ done
-+fi
-+
-+if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then
-+ echo ""
-+ echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)."
-+ echo "krita won't be able to import/export jpeg"
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBMAGICK_LIBS"; then
-+ echo ""
-+ echo "You're missing ImageMagick (>=6.1.0). krita's ImageMagick import/export"
-+ echo "filter will not be compiled. You can download ImageMagick from"
-+ echo "http://www.imagemagick.org/. The ImageMagick filter allows krita to"
-+ echo "read and write XCF, PSD, GIF, BMP, and many other image formats."
-+ echo ""
-+ echo "If you have problems compiling ImageMagick, please try configuring it using"
-+ echo "the --without-magick-plus-plus flag, the C++ API isn't needed for krita."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$OPENEXR_LIBS"; then
-+ echo ""
-+ echo "You're missing the OpenEXR library. Krita's OpenEXR import/export filter will "
-+ echo "not be compiled. You can download OpenEXR from http://www.openexr.com or "
-+ echo "install it from an appropriate binary package."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBPNG"; then
-+ echo ""
-+ echo "You're missing libpng (binaries and/or headers), krita won't be able"
-+ echo "to import/export png"
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBTIFF"; then
-+ echo ""
-+ echo "You're missing libtiff (binaries and/or headers), krita won't be able"
-+ echo "to import/export tiff"
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBWV2_LIBS"; then
-+ echo ""
-+ echo "You're missing libwv2 0.1.9 or newer. KWord's MS Word filter will not be"
-+ echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge"
-+ echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a"
-+ echo "tarball at http://sourceforge.net/projects/wvware/"
-+# echo "The MS Word filter won't be compiled due to experimental changes."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBWPD_LIBS"; then
-+ echo ""
-+ echo "You're missing libwpd 0.8 or newer. KWord's WordPerfect import filter will "
-+ echo "not be compiled. You can download libwpd from http://libwpd.sf.net or "
-+ echo "install it from appropriate binary package."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBXML_LIBS"; then
-+ echo ""
-+ echo "You're missing libxml2 (at least version 2.4.8)."
-+ echo "The XSLT filters will not be compiled."
-+ echo "Please download libxml2 from http://xmlsoft.org ."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBXSLT_LIBS"; then
-+ echo ""
-+ echo "You're missing libxslt (at least version 1.0.7)."
-+ echo "The XSLT filters will not be compiled."
-+# TODO: URL is not exacly right anymore
-+ echo "Please download libxml2 from http://xmlsoft.org ."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBART_LIBS"; then
-+ echo ""
-+ echo "You're missing libart 2.3.8. karbon will not be compiled."
-+ echo "You can download libart from"
-+ echo "http://svg.kde.org/download.html"
-+ echo ""
-+ all_tests=bad
-+else
-+ if test -z "$LIBFONTCONFIG_LIBS"; then
-+ echo ""
-+ echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text support."
-+ echo "You can download fontconfig from http://fontconfig.org/"
-+ echo ""
-+ all_tests=bad
-+ fi
-+
-+ if test -z "$LIBFREETYPE_LIBS"; then
-+ echo ""
-+ echo "You're missing libfreetype 5.0 or newer. karbon will not have text support."
-+ echo "You can download libfreetype from http://www.freetype.org/"
-+ echo ""
-+ all_tests=bad
-+ fi
-+fi
-+if test -z "$MYSQL_INC" -o -z "$MYSQL_LIBS"; then
-+
-+ echo "----------------------------------------------------------------------"
-+
-+ echo " + The MySQL development files were not found."
-+ cat <<EOS
-+ These are required for MySQL support in Kexi.
-+
-+ If you want MySQL support in Kexi, you need to install the MySQL development
-+ files, ensure that mysql-config is in your path, and run this configure script
-+ again, and finally run make; make install.
-+ If you don't need MySQL support, you can simply run make; make install now.
-+EOS
-+ all_tests=bad
-+fi
-+
-+if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" -o \
-+ -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then
-+
-+ echo "----------------------------------------------------------------------"
-+
-+# LIBPQ messages
-+ if test -z "$PG_INCDIR"; then
-+ echo " + The PostgreSQL C-API (libpq) headers were not found."
-+ fi
-+
-+ if test -z "$PG_LIBDIR"; then
-+ echo " + The PostgreSQL C-API (libpq) libraries were not found."
-+ fi
-+
-+ if test -z "$PG_INCDIR" -a -z "$PG_LIBDIR" ; then
-+ pglib_parts_missing="HEADER or the libpq LIBRARY"
-+ elif test -z "$PG_INCDIR" ; then
-+ pglib_parts_missing="HEADER"
-+ elif test -z "$PG_LIBDIR" ; then
-+ pglib_parts_missing="LIBRARY"
-+ fi
-+
-+ if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" ; then
-+ cat <<EOS
-+ Could not find the libpq $pglib_parts_missing files.
-+ These are required by the libpqxx C++ library, which is used by
-+ Kexi's PostgreSQL drivers.
-+
-+ The PostgreSQL C-API usually ship with PostgreSQL, but if you've
-+ installed from a distros package then these files may be part of
-+ a package called postgresql-devel or libpq-devel"
-+
-+EOS
-+ fi
-+
-+# LIBPQXX messages
-+ if test -z "$PQXX_INCDIR"; then
-+ echo " + The PostgreSQL C++ API (libpqxx) headers were not found."
-+ fi
-+
-+ if test -z "$PQXX_LIBDIR"; then
-+ echo " + The PostgreSQL C++ API (libpqxx) shared libraries were not found."
-+ fi
-+
-+ if test -z "$PQXX_INCDIR" -a -z "$PQXX_LIBDIR" ; then
-+ pqxx_parts_missing="HEADER or the libpqxx LIBRARY"
-+ elif test -z "$PQXX_INCDIR" ; then
-+ pqxx_parts_missing="HEADER"
-+ elif test -z "$PQXX_LIBDIR" ; then
-+ pqxx_parts_missing="LIBRARY"
-+ fi
-+
-+ if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR" ; then
-+ cat <<EOS
-+ Could not find the libpqxx $pqxx_parts_missing files.
-+ These are required by Kexi's PostgreSQL drivers.
-+
-+ Note: Kexi requires the SHARED libpqxx.so library files.
-+ If you build pqxx library on your own, don't forget to use the
-+ --enable-shared option when you run libpqxx's configure script.
-+ This is necessary to compile the SHARED .so library, and
-+ not the STATIC libpqxx.a.
-+
-+ The PostgreSQL C++ API can be downloaded from pqxx.tk or
-+ http://gborg.postgresql.org/project/libpqxx/projdisplay.php
-+ Grab the latest version (>=2)
-+
-+EOS
-+ fi
-+
-+# SUMMARY messages
-+ cat <<EOS
-+ These warnings are not critical, but without installing the files
-+ listed above Kexi will be compiled without PostgreSQL support.
-+
-+ If you want PostgreSQL support in Kexi, you need to install the files
-+ listed above, then run this configure script again, and finally run
-+ make; make install. If you don't, simply run make; make install now.
-+EOS
-+
-+ all_tests=bad
-+ echo "----------------------------------------------------------------------"
-+fi
- if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then
- echo ""
- echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)."
-@@ -61741,6 +87205,57 @@
- echo ""
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56764,16 +62556,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
fi
-+if test -z "$LCMS_LIBS"; then
-+ echo ""
-+ echo "LittleCMS is missing, Krita will not be built."
-+ echo ""
-+ echo "If you want to compile Krita you should install:"
-+ echo " * lcms 1.12 or newer (http://www.littlecms.com/)"
-+ echo " and avoid 1.14 as it has a major bugs in CMYK"
-+ echo ""
-+ all_tests=bad
-+else
-+ if test "$lcms_version_114" = 'yes'; then
-+ echo "=============================================="
-+ echo "WARNING: you are using version 1.14 of lcms"
-+ echo " this version has a bug that break filling"
-+ echo " and select similar colors in at least CMYK"
-+ echo " you might want to use a newer version, or"
-+ echo " an older"
-+ echo "=============================================="
-+ fi
-+ if test -z "$GLLIB"; then
-+ echo ""
-+ echo "You're missing OpenGL libraries. krita will"
-+ echo "not be able to use OpenGL for hardware"
-+ echo "accelerated rendering."
-+ echo ""
-+ fi
-+fi
+@@ -56784,11 +62576,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -56822,23 +62614,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
+@@ -56847,9 +62652,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+
-+
-+if test -z "$LIBKSPELL2"; then
-+ echo ""
-+ echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$RUBY_LIBDIR" -a "x$compile_kross" = "xyes" ; then
-+ echo ""
-+ echo "Ruby development files were not found, or Ruby <= 1.8.1 was found,"
-+ echo "Ruby scripting support for KOffice will not be built. If you don't"
-+ echo "need Ruby scripting, you can ignore this message."
-+ echo ""
-+fi
-+
-+if test -z "$LIBPYTHON" -a -z "$PYTHONINC" -a $"x$compile_kross" = "xyes"; then
-+ echo ""
-+ echo "Python developement files were not found, Python scripting support for"
-+ echo "KOffice will not be built. If you don't need Python scripting, you"
-+ echo "can ignore this message"
-+ echo ""
-+fi
-+
- # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
- if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
- # And if so, warn when they don't match
---- configure.files
-+++ configure.files
-@@ -26,6 +26,45 @@
- ./kexi/plugins/configure.in.in
- ./kexi/plugins/configure.in.mid
- ./kivio/configure.in.in
-+./koffice-1.5.1/configure.in.in
-+./koffice-1.5.1/example/configure.in.in
-+./koffice-1.5.1/filters/configure.in.mid
-+./koffice-1.5.1/filters/krita/configure.in.in
-+./koffice-1.5.1/filters/krita/jpeg/configure.in.bot
-+./koffice-1.5.1/filters/krita/magick/configure.in.bot
-+./koffice-1.5.1/filters/krita/openexr/configure.in.bot
-+./koffice-1.5.1/filters/krita/png/configure.in.bot
-+./koffice-1.5.1/filters/krita/tiff/configure.in.bot
-+./koffice-1.5.1/filters/kword/msword/configure.in.bot
-+./koffice-1.5.1/filters/kword/msword/configure.in.in
-+./koffice-1.5.1/filters/kword/pdf/xpdf/configure.in.in
-+./koffice-1.5.1/filters/kword/wordperfect/configure.in.bot
-+./koffice-1.5.1/filters/kword/wordperfect/configure.in.in
-+./koffice-1.5.1/filters/xsltfilter/configure.in.bot
-+./koffice-1.5.1/filters/xsltfilter/configure.in.in
-+./koffice-1.5.1/karbon/configure.in.bot
-+./koffice-1.5.1/karbon/configure.in.in
-+./koffice-1.5.1/kexi/3rdparty/configure.in.in
-+./koffice-1.5.1/kexi/configure.in.in
-+./koffice-1.5.1/kexi/kexidb/drivers/configure.in.bot
-+./koffice-1.5.1/kexi/kexidb/drivers/configure.in.in
-+./koffice-1.5.1/kexi/main/configure.in.in
-+./koffice-1.5.1/kexi/migration/configure.in.in
-+./koffice-1.5.1/kexi/plugins/configure.in.in
-+./koffice-1.5.1/kexi/plugins/configure.in.mid
-+./koffice-1.5.1/kivio/configure.in.in
-+./koffice-1.5.1/krita/configure.in.bot
-+./koffice-1.5.1/krita/configure.in.in
-+./koffice-1.5.1/krita/plugins/configure.in.in
-+./koffice-1.5.1/krita/plugins/viewplugins/imagesize/configure.in.in
-+./koffice-1.5.1/kspread/plugins/calculator/configure.in.in
-+./koffice-1.5.1/kword/mailmerge/configure.in.in
-+./koffice-1.5.1/lib/configure.in.in
-+./koffice-1.5.1/lib/configure.in.mid
-+./koffice-1.5.1/lib/kotext/configure.in.bot
-+./koffice-1.5.1/lib/kotext/configure.in.in
-+./koffice-1.5.1/lib/kross/configure.in.bot
-+./koffice-1.5.1/lib/kross/configure.in.in
- ./krita/configure.in.bot
- ./krita/configure.in.in
- ./krita/plugins/configure.in.in
---- configure.in
-+++ configure.in
-@@ -42,6 +42,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(koffice, "1.5.1") dnl searches for some needed programs
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+@@ -56860,16 +62666,16 @@
-+AM_MAINTAINER_MODE
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -56918,8 +62724,8 @@
+ if test "x$compile_kross" = "xyes" ; then
+ # Extract the first word of "ruby", so it can be a program name with args.
+ set dummy ruby; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RUBY+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -56932,29 +62738,31 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RUBY="ruby"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ RUBY=$ac_cv_prog_RUBY
+ if test -n "$RUBY"; then
+- echo "$as_me:$LINENO: result: $RUBY" >&5
+-echo "${ECHO_T}$RUBY" >&6
++ { echo "$as_me:$LINENO: result: $RUBY" >&5
++echo "${ECHO_T}$RUBY" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
- KDE_SET_PREFIX
+ if test -n "$RUBY"; then
+- echo "$as_me:$LINENO: checking for Ruby dirs" >&5
+-echo $ECHO_N "checking for Ruby dirs... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for Ruby dirs" >&5
++echo $ECHO_N "checking for Ruby dirs... $ECHO_C" >&6; }
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["archdir"])'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
+@@ -56962,7 +62770,7 @@
+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["libdir"])'`
+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["LIBRUBYARG_SHARED"])'`
+ RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["ENABLE_SHARED"])'`
+- echo "$as_me:$LINENO: result:
++ { echo "$as_me:$LINENO: result:
+ archdir $RUBY_ARCHDIR,
+ sitearchdir $RUBY_SITEARCHDIR,
+ sitedir $RUBY_SITEDIR,
+@@ -56977,7 +62785,7 @@
+ includedir $RUBY_INCLUDEDIR,
+ libdir $RUBY_LIBDIR,
+ librubyarg $RUBY_LIBRUBYARG,
+- rubysharedenabled $RUBY_ENABLESHARED" >&6
++ rubysharedenabled $RUBY_ENABLESHARED" >&6; }
- dnl generate the config header
-@@ -431,7 +433,8 @@
- vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test -n "$vers" && test "$vers" -ge 1009
- then
-- LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-+ #LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-+ LIBWV2_LIBS="-lwv2"
- LIBWV2_RPATH=
- for args in $LIBWV2_LIBS; do
- case $args in
-@@ -1164,135 +1167,1622 @@
- dnl Do we have Python?
- KDE_CHECK_PYTHON
- dnl =======================================================
--dnl FILE: ./krita/configure.in.in
-+dnl FILE: ./koffice-1.5.1/configure.in.in
- dnl =======================================================
--KDE_CHECK_LIB(Xi, XOpenDisplay, [
-- LIB_XINPUTEXT="-lXi"
-- AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension])
-- ])
--AC_SUBST(LIB_XINPUTEXT)
--
--# Check for lcms
--AC_MSG_CHECKING([for lcms >= 1.12])
-+#MIN_CONFIG(3.3)
--have_lcms_header='no'
--KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
--if test "$have_lcms_header" = 'yes'
--then
-- AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header])
-+# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h
-+dnl PACKAGE set before
+@@ -56986,8 +62794,8 @@
-- echo "#include <lcms/lcms.h>" > conftest.$ac_ext
-- echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-- echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-- echo "#endif" >> conftest.$ac_ext
-- echo "int main() {}" >> conftest.$ac_ext
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
--else
-- # Alternative! Debian does it this way...
-- KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
-+AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h)
-+AC_C_BIGENDIAN
-+AC_CHECK_KDEMAXPATHLEN
-- AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
-+KDE_INIT_DOXYGEN([The KOffice API Reference], [Version $VERSION])
+- echo "$as_me:$LINENO: checking for Ruby header" >&5
+-echo $ECHO_N "checking for Ruby header... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for Ruby header" >&5
++echo $ECHO_N "checking for Ruby header... $ECHO_C" >&6; }
-- echo "#include <lcms.h>" > conftest.$ac_ext
-- echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-- echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-- echo "#endif" >> conftest.$ac_ext
-- echo "int main() {}" >> conftest.$ac_ext
--fi
+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
+ # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR
+@@ -56996,32 +62804,31 @@
-+# Check for ImageMagick...
+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
+ RUBY_LIBDIR=""
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ else
+- echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6 # header
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; } # header
--ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext -llcms 1>&5'
-+have_imagemagick=no
-+KDE_FIND_PATH(Magick-config, MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2.])
-+])
+- echo "$as_me:$LINENO: checking Ruby shared library" >&5
+-echo $ECHO_N "checking Ruby shared library... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking Ruby shared library" >&5
++echo $ECHO_N "checking Ruby shared library... $ECHO_C" >&6; }
+ if test "x$RUBY_ENABLESHARED" != "xyes" ; then
+- echo "$as_me:$LINENO: result: shared library not found" >&5
+-echo "${ECHO_T}shared library not found" >&6
++ { echo "$as_me:$LINENO: result: shared library not found" >&5
++echo "${ECHO_T}shared library not found" >&6; }
+ RUBY_LIBDIR=""
+ else
+ if test -z "$RUBY_LIBRUBYARG" ; then
+- echo "$as_me:$LINENO: result: link argument not found" >&5
+-echo "${ECHO_T}link argument not found" >&6
++ { echo "$as_me:$LINENO: result: link argument not found" >&5
++echo "${ECHO_T}link argument not found" >&6; }
+ RUBY_LIBDIR=""
+ else
+- echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6 # shared library link arg
+-
+- echo "$as_me:$LINENO: checking if C++ program with ruby can be compiled" >&5
+-echo $ECHO_N "checking if C++ program with ruby can be compiled... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; } # shared library link arg
--if AC_TRY_EVAL(ac_link) && test -s conftest; then
-- AC_MSG_RESULT(yes)
-- HAVELCMS="yes"
-- LCMS_LIBS="-llcms"
--else
-- AC_MSG_RESULT(no)
-- HAVELCMS="no"
-- LCMS_LIBS=""
-- DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
-+if test -n "$MAGICK_CONFIG"; then
-+ vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5005002
-+ then
-+ if test "$vers" -ge 6000003
-+ then
-+ AC_DEFINE(HAVE_MAGICK6, 1, [ImageMagick Version 6])
-+ fi
-+ if test "$vers" -ge 6001000
-+ then
-+ AC_DEFINE(HAVE_MAGICK61, 1, [ImageMagick Version 6.1])
-+ fi
-+ LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
-+ LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`"
-+ LIBMAGICK_RPATH=
-+ for args in $LIBMAGICK_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`"
-+ AC_DEFINE(HAVE_MAGICK,1, [ImageMagick is available])
-+ have_imagemagick=yes
-+ else
-+ AC_MSG_WARN([You need at least ImageMagick 5.5.2])
-+ fi
++ { echo "$as_me:$LINENO: checking if C++ program with ruby can be compiled" >&5
++echo $ECHO_N "checking if C++ program with ruby can be compiled... $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'
+@@ -57063,23 +62870,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
+@@ -57088,14 +62908,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ruby_build=no
++ ruby_build=no
fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--AC_SUBST(LCMS_LIBS)
--
--# Check if the 1.14 version of lcms is detected
--if test ! "$LCMS_LIBS" = ""
--then
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE(
-- [#include LCMS_HEADER
-- #if LCMS_VERSION == 114
-- #error lcms 1.14 detected
-- #endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
--AC_LANG_RESTORE
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBMAGICK_RPATH=
fi
--# IM 6.1.3 changed the number of arguments to GetMagickInfoList
-+AC_SUBST(LIBMAGICK_LIBS)
-+AC_SUBST(LIBMAGICK_LDFLAGS)
-+AC_SUBST(LIBMAGICK_CPPFLAGS)
-+AC_SUBST(LIBMAGICK_RPATH)
-+AM_CONDITIONAL(include_imagemagick_filter, test "$have_imagemagick" = "yes" -a HAVE_MAGICK61)
+- echo "$as_me:$LINENO: result: $ruby_build" >&5
+-echo "${ECHO_T}$ruby_build" >&6
++ { echo "$as_me:$LINENO: result: $ruby_build" >&5
++echo "${ECHO_T}$ruby_build" >&6; }
+ if test "$ruby_build" = "no"; then
+ RUBY_LIBDIR=""
+ fi
+@@ -57143,8 +62964,8 @@
+ fi
--AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments)
--CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags
--CPPFLAGS="$LIBMAGICK_CPPFLAGS"
-+# End of ImageMagick check
+ for i in $ac_topsubdirs; do
+- echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
++echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+ if test -d $srcdir/$i; then
+ install_it="yes"
+ for j in $DO_NOT_COMPILE; do
+@@ -57155,8 +62976,8 @@
+ else
+ install_it="no"
+ fi
+- echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
++ { echo "$as_me:$LINENO: result: $install_it" >&5
++echo "${ECHO_T}$install_it" >&6; }
+ vari=`echo $i | sed -e 's,[-+.@],_,g'`
+ if test $install_it = "yes"; then
+ TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -57428,1014 +63249,1014 @@
+ filters_SUBDIR_included_FALSE=
+ fi
--AC_TRY_COMPILE(
-- [#include <stdio.h>
-- #if HAVE_SYS_TYPES_H
-- #include <sys/types.h>
-- #endif
-- #include "magick/api.h"],
-- [const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)],
-- magick_info_list='yes',
-- magick_info_list='no')
-+##########################################################################
-+# This last check is copied from kdenonbeta/gsf/configure.in.in
-+##########################################################################
-+# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+# also defines GSTUFF_PKG_ERRORS on error
-+# Note: This is specially tweaked for karbon's fontconfig check. Please fix
-+# it before using it for other tests :-)
-+AC_DEFUN([KOFFICE_PKG_CHECK_MODULES], [
-+ succeeded=no
+- ac_config_files="$ac_config_files Makefile"
++ac_config_files="$ac_config_files Makefile"
--CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
+- ac_config_files="$ac_config_files autocorrect/Makefile"
++ac_config_files="$ac_config_files autocorrect/Makefile"
--if test "$magick_info_list" = 'yes'; then
-- AC_MSG_RESULT(yes)
-- AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3])
--else
-- AC_MSG_RESULT(no)
--fi
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ echo "***"
-+ echo "*** Due to that we can't perform the check for fontconfig..." # added for karbon (Werner)
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ AC_MSG_CHECKING(for $2)
+- ac_config_files="$ac_config_files doc/Makefile"
++ac_config_files="$ac_config_files doc/Makefile"
--# Check for kunittest
--AC_MSG_CHECKING([for kunittest])
-+ if $PKG_CONFIG --exists "$2" ; then
-+ AC_MSG_RESULT(yes)
-+ succeeded=yes
+- ac_config_files="$ac_config_files doc/karbon/Makefile"
++ac_config_files="$ac_config_files doc/karbon/Makefile"
--have_kunittest_header="no"
--KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
--AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes")
-+ AC_MSG_CHECKING($1_CFLAGS)
-+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+ AC_MSG_RESULT($$1_CFLAGS)
+- ac_config_files="$ac_config_files doc/kchart/Makefile"
++ac_config_files="$ac_config_files doc/kchart/Makefile"
--# --- OpenGL check ---
-+ AC_MSG_CHECKING($1_LIBS)
-+ $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+ AC_MSG_RESULT($$1_LIBS)
-+ else
-+ $1_CFLAGS=""
-+ $1_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+ fi
+- ac_config_files="$ac_config_files doc/kexi/Makefile"
++ac_config_files="$ac_config_files doc/kexi/Makefile"
--AC_HAVE_GL( [], [] )
-+ AC_SUBST($1_CFLAGS)
-+ AC_SUBST($1_LIBS)
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
+- ac_config_files="$ac_config_files doc/kformula/Makefile"
++ac_config_files="$ac_config_files doc/kformula/Makefile"
--# --- End of OpenGL check ---
-+ if test $succeeded = yes; then
-+ ifelse([$3], , :, [$3])
-+# else # removed for karbon (Werner)
-+# ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+ fi
-+])
+- ac_config_files="$ac_config_files doc/kivio/Makefile"
++ac_config_files="$ac_config_files doc/kivio/Makefile"
--# Check for powf.
-+# --- Check for KDE 3.2 or 3.3 ---
+- ac_config_files="$ac_config_files doc/koffice/Makefile"
++ac_config_files="$ac_config_files doc/koffice/Makefile"
--AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])])
-+AC_MSG_CHECKING([for KDE version])
+- ac_config_files="$ac_config_files doc/koshell/Makefile"
++ac_config_files="$ac_config_files doc/koshell/Makefile"
--if test "$have_powf" = 'yes'; then
-- AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in <maths.h>])
+- ac_config_files="$ac_config_files doc/kplato/Makefile"
++ac_config_files="$ac_config_files doc/kplato/Makefile"
+
+- ac_config_files="$ac_config_files doc/kpresenter/Makefile"
++ac_config_files="$ac_config_files doc/kpresenter/Makefile"
+
+- ac_config_files="$ac_config_files doc/krita/Makefile"
++ac_config_files="$ac_config_files doc/krita/Makefile"
+
+- ac_config_files="$ac_config_files doc/kspread/Makefile"
++ac_config_files="$ac_config_files doc/kspread/Makefile"
+
+- ac_config_files="$ac_config_files doc/kugar/Makefile"
++ac_config_files="$ac_config_files doc/kugar/Makefile"
+
+- ac_config_files="$ac_config_files doc/kword/Makefile"
++ac_config_files="$ac_config_files doc/kword/Makefile"
+
+- ac_config_files="$ac_config_files doc/thesaurus/Makefile"
++ac_config_files="$ac_config_files doc/thesaurus/Makefile"
+
+- ac_config_files="$ac_config_files example/Makefile"
++ac_config_files="$ac_config_files example/Makefile"
+
+- ac_config_files="$ac_config_files filters/Makefile"
++ac_config_files="$ac_config_files filters/Makefile"
+
+- ac_config_files="$ac_config_files filters/generic_wrapper/Makefile"
++ac_config_files="$ac_config_files filters/generic_wrapper/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/Makefile"
++ac_config_files="$ac_config_files filters/karbon/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/ai/Makefile"
++ac_config_files="$ac_config_files filters/karbon/ai/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/applixgraphics/Makefile"
++ac_config_files="$ac_config_files filters/karbon/applixgraphics/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/eps/Makefile"
++ac_config_files="$ac_config_files filters/karbon/eps/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/kontour/Makefile"
++ac_config_files="$ac_config_files filters/karbon/kontour/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/msod/Makefile"
++ac_config_files="$ac_config_files filters/karbon/msod/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/oodraw/Makefile"
++ac_config_files="$ac_config_files filters/karbon/oodraw/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/png/Makefile"
++ac_config_files="$ac_config_files filters/karbon/png/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/svg/Makefile"
++ac_config_files="$ac_config_files filters/karbon/svg/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/wmf/Makefile"
++ac_config_files="$ac_config_files filters/karbon/wmf/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/xaml/Makefile"
++ac_config_files="$ac_config_files filters/karbon/xaml/Makefile"
+
+- ac_config_files="$ac_config_files filters/karbon/xcf/Makefile"
++ac_config_files="$ac_config_files filters/karbon/xcf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/Makefile"
++ac_config_files="$ac_config_files filters/kchart/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/bmp/Makefile"
++ac_config_files="$ac_config_files filters/kchart/bmp/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/jpeg/Makefile"
++ac_config_files="$ac_config_files filters/kchart/jpeg/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/libimageexport/Makefile"
++ac_config_files="$ac_config_files filters/kchart/libimageexport/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/mng/Makefile"
++ac_config_files="$ac_config_files filters/kchart/mng/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/png/Makefile"
++ac_config_files="$ac_config_files filters/kchart/png/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/svg/Makefile"
++ac_config_files="$ac_config_files filters/kchart/svg/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/xbm/Makefile"
++ac_config_files="$ac_config_files filters/kchart/xbm/Makefile"
+
+- ac_config_files="$ac_config_files filters/kchart/xpm/Makefile"
++ac_config_files="$ac_config_files filters/kchart/xpm/Makefile"
+
+- ac_config_files="$ac_config_files filters/kformula/Makefile"
++ac_config_files="$ac_config_files filters/kformula/Makefile"
+
+- ac_config_files="$ac_config_files filters/kformula/latex/Makefile"
++ac_config_files="$ac_config_files filters/kformula/latex/Makefile"
+
+- ac_config_files="$ac_config_files filters/kformula/mathml/Makefile"
++ac_config_files="$ac_config_files filters/kformula/mathml/Makefile"
+
+- ac_config_files="$ac_config_files filters/kformula/png/Makefile"
++ac_config_files="$ac_config_files filters/kformula/png/Makefile"
+
+- ac_config_files="$ac_config_files filters/kformula/svg/Makefile"
++ac_config_files="$ac_config_files filters/kformula/svg/Makefile"
+
+- ac_config_files="$ac_config_files filters/kivio/Makefile"
++ac_config_files="$ac_config_files filters/kivio/Makefile"
+
+- ac_config_files="$ac_config_files filters/kivio/imageexport/Makefile"
++ac_config_files="$ac_config_files filters/kivio/imageexport/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/bmp/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/bmp/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/jpeg/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/jpeg/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/kword/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/kword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/libimageexport/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/libimageexport/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/magicpoint/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/magicpoint/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/mng/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/mng/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/ooimpress/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/ooimpress/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/png/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/png/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/powerpoint/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/powerpoint/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/powerpoint/import/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/powerpoint/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/powerpoint/libppt/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/powerpoint/libppt/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/svg/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/svg/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/xbm/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/xbm/Makefile"
+
+- ac_config_files="$ac_config_files filters/kpresenter/xpm/Makefile"
++ac_config_files="$ac_config_files filters/kpresenter/xpm/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/Makefile"
++ac_config_files="$ac_config_files filters/krita/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/jpeg/Makefile"
++ac_config_files="$ac_config_files filters/krita/jpeg/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/libkisexif/Makefile"
++ac_config_files="$ac_config_files filters/krita/libkisexif/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/magick/Makefile"
++ac_config_files="$ac_config_files filters/krita/magick/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/openexr/Makefile"
++ac_config_files="$ac_config_files filters/krita/openexr/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/png/Makefile"
++ac_config_files="$ac_config_files filters/krita/png/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/raw/Makefile"
++ac_config_files="$ac_config_files filters/krita/raw/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/tiff/Makefile"
++ac_config_files="$ac_config_files filters/krita/tiff/Makefile"
+
+- ac_config_files="$ac_config_files filters/krita/xcf/Makefile"
++ac_config_files="$ac_config_files filters/krita/xcf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/Makefile"
++ac_config_files="$ac_config_files filters/kspread/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/applixspread/Makefile"
++ac_config_files="$ac_config_files filters/kspread/applixspread/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/csv/Makefile"
++ac_config_files="$ac_config_files filters/kspread/csv/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/dbase/Makefile"
++ac_config_files="$ac_config_files filters/kspread/dbase/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/excel/Makefile"
++ac_config_files="$ac_config_files filters/kspread/excel/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/excel/import/Makefile"
++ac_config_files="$ac_config_files filters/kspread/excel/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/excel/sidewinder/Makefile"
++ac_config_files="$ac_config_files filters/kspread/excel/sidewinder/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/gnumeric/Makefile"
++ac_config_files="$ac_config_files filters/kspread/gnumeric/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/html/Makefile"
++ac_config_files="$ac_config_files filters/kspread/html/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/latex/Makefile"
++ac_config_files="$ac_config_files filters/kspread/latex/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/latex/export/Makefile"
++ac_config_files="$ac_config_files filters/kspread/latex/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/libkspreadexport/Makefile"
++ac_config_files="$ac_config_files filters/kspread/libkspreadexport/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/opencalc/Makefile"
++ac_config_files="$ac_config_files filters/kspread/opencalc/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/qpro/Makefile"
++ac_config_files="$ac_config_files filters/kspread/qpro/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/Makefile"
++ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/qpro/Makefile"
++ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/qpro/Makefile"
+
+- ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/src/Makefile"
++ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/src/Makefile"
+
+- ac_config_files="$ac_config_files filters/kugar/Makefile"
++ac_config_files="$ac_config_files filters/kugar/Makefile"
+
+- ac_config_files="$ac_config_files filters/kugar/kugarnop/Makefile"
++ac_config_files="$ac_config_files filters/kugar/kugarnop/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/Makefile"
++ac_config_files="$ac_config_files filters/kword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/abiword/Makefile"
++ac_config_files="$ac_config_files filters/kword/abiword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/amipro/Makefile"
++ac_config_files="$ac_config_files filters/kword/amipro/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/applixword/Makefile"
++ac_config_files="$ac_config_files filters/kword/applixword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/ascii/Makefile"
++ac_config_files="$ac_config_files filters/kword/ascii/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/docbook/Makefile"
++ac_config_files="$ac_config_files filters/kword/docbook/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/hancomword/Makefile"
++ac_config_files="$ac_config_files filters/kword/hancomword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/html/Makefile"
++ac_config_files="$ac_config_files filters/kword/html/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/html/export/Makefile"
++ac_config_files="$ac_config_files filters/kword/html/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/html/import/Makefile"
++ac_config_files="$ac_config_files filters/kword/html/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/kword1.3/Makefile"
++ac_config_files="$ac_config_files filters/kword/kword1.3/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/kword1.3/import/Makefile"
++ac_config_files="$ac_config_files filters/kword/kword1.3/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/latex/Makefile"
++ac_config_files="$ac_config_files filters/kword/latex/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/latex/export/Makefile"
++ac_config_files="$ac_config_files filters/kword/latex/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/latex/import/Makefile"
++ac_config_files="$ac_config_files filters/kword/latex/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/latex/import/generator/Makefile"
++ac_config_files="$ac_config_files filters/kword/latex/import/generator/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/latex/import/parser/Makefile"
++ac_config_files="$ac_config_files filters/kword/latex/import/parser/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/libexport/Makefile"
++ac_config_files="$ac_config_files filters/kword/libexport/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/msword/Makefile"
++ac_config_files="$ac_config_files filters/kword/msword/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/mswrite/Makefile"
++ac_config_files="$ac_config_files filters/kword/mswrite/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/oowriter/Makefile"
++ac_config_files="$ac_config_files filters/kword/oowriter/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/palmdoc/Makefile"
++ac_config_files="$ac_config_files filters/kword/palmdoc/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/pdf/Makefile"
++ac_config_files="$ac_config_files filters/kword/pdf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/pdf/xpdf/Makefile"
++ac_config_files="$ac_config_files filters/kword/pdf/xpdf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/pdf/xpdf/goo/Makefile"
++ac_config_files="$ac_config_files filters/kword/pdf/xpdf/goo/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/pdf/xpdf/xpdf/Makefile"
++ac_config_files="$ac_config_files filters/kword/pdf/xpdf/xpdf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/rtf/Makefile"
++ac_config_files="$ac_config_files filters/kword/rtf/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/rtf/export/Makefile"
++ac_config_files="$ac_config_files filters/kword/rtf/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/rtf/import/Makefile"
++ac_config_files="$ac_config_files filters/kword/rtf/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/starwriter/Makefile"
++ac_config_files="$ac_config_files filters/kword/starwriter/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/wml/Makefile"
++ac_config_files="$ac_config_files filters/kword/wml/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/wordperfect/Makefile"
++ac_config_files="$ac_config_files filters/kword/wordperfect/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/wordperfect/export/Makefile"
++ac_config_files="$ac_config_files filters/kword/wordperfect/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/kword/wordperfect/import/Makefile"
++ac_config_files="$ac_config_files filters/kword/wordperfect/import/Makefile"
+
+- ac_config_files="$ac_config_files filters/libdialogfilter/Makefile"
++ac_config_files="$ac_config_files filters/libdialogfilter/Makefile"
+
+- ac_config_files="$ac_config_files filters/liboofilter/Makefile"
++ac_config_files="$ac_config_files filters/liboofilter/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/export/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/export/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/xslfo/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/xslfo/Makefile"
+
+- ac_config_files="$ac_config_files filters/xsltfilter/import/Makefile"
++ac_config_files="$ac_config_files filters/xsltfilter/import/Makefile"
+
+- ac_config_files="$ac_config_files interfaces/Makefile"
++ac_config_files="$ac_config_files interfaces/Makefile"
+
+- ac_config_files="$ac_config_files karbon/Makefile"
++ac_config_files="$ac_config_files karbon/Makefile"
+
+- ac_config_files="$ac_config_files karbon/commands/Makefile"
++ac_config_files="$ac_config_files karbon/commands/Makefile"
+
+- ac_config_files="$ac_config_files karbon/core/Makefile"
++ac_config_files="$ac_config_files karbon/core/Makefile"
+
+- ac_config_files="$ac_config_files karbon/data/Makefile"
++ac_config_files="$ac_config_files karbon/data/Makefile"
+
+- ac_config_files="$ac_config_files karbon/dialogs/Makefile"
++ac_config_files="$ac_config_files karbon/dialogs/Makefile"
+
+- ac_config_files="$ac_config_files karbon/dockers/Makefile"
++ac_config_files="$ac_config_files karbon/dockers/Makefile"
+
+- ac_config_files="$ac_config_files karbon/pics/Makefile"
++ac_config_files="$ac_config_files karbon/pics/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/flattenpath/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/flattenpath/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/imagetool/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/imagetool/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/insertknots/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/insertknots/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/roundcorners/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/roundcorners/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/shadoweffect/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/shadoweffect/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/whirlpinch/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/whirlpinch/Makefile"
+
+- ac_config_files="$ac_config_files karbon/plugins/zoomtool/Makefile"
++ac_config_files="$ac_config_files karbon/plugins/zoomtool/Makefile"
+
+- ac_config_files="$ac_config_files karbon/render/Makefile"
++ac_config_files="$ac_config_files karbon/render/Makefile"
+
+- ac_config_files="$ac_config_files karbon/render/xrgbrender/Makefile"
++ac_config_files="$ac_config_files karbon/render/xrgbrender/Makefile"
+
+- ac_config_files="$ac_config_files karbon/shapes/Makefile"
++ac_config_files="$ac_config_files karbon/shapes/Makefile"
+
+- ac_config_files="$ac_config_files karbon/templates/Makefile"
++ac_config_files="$ac_config_files karbon/templates/Makefile"
+
+- ac_config_files="$ac_config_files karbon/templates/basic/Makefile"
++ac_config_files="$ac_config_files karbon/templates/basic/Makefile"
+
+- ac_config_files="$ac_config_files karbon/tools/Makefile"
++ac_config_files="$ac_config_files karbon/tools/Makefile"
+
+- ac_config_files="$ac_config_files karbon/visitors/Makefile"
++ac_config_files="$ac_config_files karbon/visitors/Makefile"
+
+- ac_config_files="$ac_config_files karbon/widgets/Makefile"
++ac_config_files="$ac_config_files karbon/widgets/Makefile"
+
+- ac_config_files="$ac_config_files kchart/Makefile"
++ac_config_files="$ac_config_files kchart/Makefile"
+
+- ac_config_files="$ac_config_files kchart/kdchart/Makefile"
++ac_config_files="$ac_config_files kchart/kdchart/Makefile"
+
+- ac_config_files="$ac_config_files kchart/pics/Makefile"
++ac_config_files="$ac_config_files kchart/pics/Makefile"
+
+- ac_config_files="$ac_config_files kchart/templates/Makefile"
++ac_config_files="$ac_config_files kchart/templates/Makefile"
+
+- ac_config_files="$ac_config_files kchart/toolbar/Makefile"
++ac_config_files="$ac_config_files kchart/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files kchart/toolbar/crystalsvg/Makefile"
++ac_config_files="$ac_config_files kchart/toolbar/crystalsvg/Makefile"
+
+- ac_config_files="$ac_config_files kchart/toolbar/locolor/Makefile"
++ac_config_files="$ac_config_files kchart/toolbar/locolor/Makefile"
+
+- ac_config_files="$ac_config_files kdgantt/Makefile"
++ac_config_files="$ac_config_files kdgantt/Makefile"
+
+- ac_config_files="$ac_config_files kexi/Makefile"
++ac_config_files="$ac_config_files kexi/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kexisql/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kexisql/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kexisql/src/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kexisql/src/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kexisql/tool/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kexisql/tool/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/src/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/src/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/kolibs/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/kolibs/Makefile"
+
+- ac_config_files="$ac_config_files kexi/3rdparty/uuid/Makefile"
++ac_config_files="$ac_config_files kexi/3rdparty/uuid/Makefile"
+
+- ac_config_files="$ac_config_files kexi/core/Makefile"
++ac_config_files="$ac_config_files kexi/core/Makefile"
+
+- ac_config_files="$ac_config_files kexi/data/Makefile"
++ac_config_files="$ac_config_files kexi/data/Makefile"
+
+- ac_config_files="$ac_config_files kexi/data/kde34compat/Makefile"
++ac_config_files="$ac_config_files kexi/data/kde34compat/Makefile"
+
+- ac_config_files="$ac_config_files kexi/examples/Makefile"
++ac_config_files="$ac_config_files kexi/examples/Makefile"
+
+- ac_config_files="$ac_config_files kexi/formeditor/Makefile"
++ac_config_files="$ac_config_files kexi/formeditor/Makefile"
+
+- ac_config_files="$ac_config_files kexi/formeditor/factories/Makefile"
++ac_config_files="$ac_config_files kexi/formeditor/factories/Makefile"
+
+- ac_config_files="$ac_config_files kexi/formeditor/kdevelop_plugin/Makefile"
++ac_config_files="$ac_config_files kexi/formeditor/kdevelop_plugin/Makefile"
+
+- ac_config_files="$ac_config_files kexi/formeditor/scripting/Makefile"
++ac_config_files="$ac_config_files kexi/formeditor/scripting/Makefile"
+
+- ac_config_files="$ac_config_files kexi/formeditor/test/Makefile"
++ac_config_files="$ac_config_files kexi/formeditor/test/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/mySQL/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/mySQL/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/odbc/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/odbc/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/pqxx/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/pqxx/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite2/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite2/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexidb/parser/Makefile"
++ac_config_files="$ac_config_files kexi/kexidb/parser/Makefile"
+
+- ac_config_files="$ac_config_files kexi/kexiutils/Makefile"
++ac_config_files="$ac_config_files kexi/kexiutils/Makefile"
+
+- ac_config_files="$ac_config_files kexi/main/Makefile"
++ac_config_files="$ac_config_files kexi/main/Makefile"
+
+- ac_config_files="$ac_config_files kexi/main/printing/Makefile"
++ac_config_files="$ac_config_files kexi/main/printing/Makefile"
+
+- ac_config_files="$ac_config_files kexi/main/startup/Makefile"
++ac_config_files="$ac_config_files kexi/main/startup/Makefile"
+
+- ac_config_files="$ac_config_files kexi/migration/Makefile"
++ac_config_files="$ac_config_files kexi/migration/Makefile"
+
+- ac_config_files="$ac_config_files kexi/migration/mysql/Makefile"
++ac_config_files="$ac_config_files kexi/migration/mysql/Makefile"
+
+- ac_config_files="$ac_config_files kexi/migration/pqxx/Makefile"
++ac_config_files="$ac_config_files kexi/migration/pqxx/Makefile"
+
+- ac_config_files="$ac_config_files kexi/migration/txt/Makefile"
++ac_config_files="$ac_config_files kexi/migration/txt/Makefile"
+
+- ac_config_files="$ac_config_files kexi/pics/Makefile"
++ac_config_files="$ac_config_files kexi/pics/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/forms/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/forms/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/forms/widgets/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/forms/widgets/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/importexport/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/importexport/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/importexport/csv/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/importexport/csv/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/migration/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/migration/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/queries/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/queries/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/relations/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/relations/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/reports/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/reports/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/kexiapp/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/kexiapp/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/kexidb/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/kexidb/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/kexiscripting/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/kexiscripting/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/copycenter/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/copycenter/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/exportxhtml/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/exportxhtml/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/importxhtml/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/importxhtml/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/projectdocumentor/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/projectdocumentor/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/kexiapp/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/kexiapp/Makefile"
+
+- ac_config_files="$ac_config_files kexi/plugins/tables/Makefile"
++ac_config_files="$ac_config_files kexi/plugins/tables/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/Makefile"
++ac_config_files="$ac_config_files kexi/tests/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/newapi/Makefile"
++ac_config_files="$ac_config_files kexi/tests/newapi/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/parser/Makefile"
++ac_config_files="$ac_config_files kexi/tests/parser/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/startup/Makefile"
++ac_config_files="$ac_config_files kexi/tests/startup/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/tableview/Makefile"
++ac_config_files="$ac_config_files kexi/tests/tableview/Makefile"
+
+- ac_config_files="$ac_config_files kexi/tests/widgets/Makefile"
++ac_config_files="$ac_config_files kexi/tests/widgets/Makefile"
+
+- ac_config_files="$ac_config_files kexi/widget/Makefile"
++ac_config_files="$ac_config_files kexi/widget/Makefile"
+
+- ac_config_files="$ac_config_files kexi/widget/relations/Makefile"
++ac_config_files="$ac_config_files kexi/widget/relations/Makefile"
+
+- ac_config_files="$ac_config_files kexi/widget/tableview/Makefile"
++ac_config_files="$ac_config_files kexi/widget/tableview/Makefile"
+
+- ac_config_files="$ac_config_files kexi/widget/utils/Makefile"
++ac_config_files="$ac_config_files kexi/widget/utils/Makefile"
+
+- ac_config_files="$ac_config_files kformula/Makefile"
++ac_config_files="$ac_config_files kformula/Makefile"
+
+- ac_config_files="$ac_config_files kformula/pics/Makefile"
++ac_config_files="$ac_config_files kformula/pics/Makefile"
+
+- ac_config_files="$ac_config_files kivio/Makefile"
++ac_config_files="$ac_config_files kivio/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/config/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/config/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/kiviosdk/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/kiviosdk/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/pics/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/pics/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Assorted/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Assorted/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Circuit/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Circuit/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Cisco/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Cisco/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Civil/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Civil/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Contact/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Contact/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Electric/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Electric/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Jigsaw/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Jigsaw/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/MSE/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/MSE/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Network/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Network/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Pneumatic/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Pneumatic/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/SDL/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/SDL/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Sybase/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Sybase/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Extended/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Extended/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Logic/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Logic/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Flags/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Flags/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Maps/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Maps/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Computer/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Computer/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/ER/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/ER/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/People/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/People/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/tiles/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/tiles/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/tools/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/tools/Makefile"
+
+- ac_config_files="$ac_config_files kivio/kiviopart/ui/Makefile"
++ac_config_files="$ac_config_files kivio/kiviopart/ui/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/straight_connector/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/straight_connector/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/select_pics/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/select_pics/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/sml_connector/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/sml_connector/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviotargettool/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviotargettool/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviotexttool/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviotexttool/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/Makefile"
+
+- ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/zoom_pics/Makefile"
++ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/zoom_pics/Makefile"
+
+- ac_config_files="$ac_config_files kivio/templates/Makefile"
++ac_config_files="$ac_config_files kivio/templates/Makefile"
+
+- ac_config_files="$ac_config_files kivio/templates/basic/Makefile"
++ac_config_files="$ac_config_files kivio/templates/basic/Makefile"
+
+- ac_config_files="$ac_config_files koshell/Makefile"
++ac_config_files="$ac_config_files koshell/Makefile"
+
+- ac_config_files="$ac_config_files kounavail/Makefile"
++ac_config_files="$ac_config_files kounavail/Makefile"
+
+- ac_config_files="$ac_config_files kplato/Makefile"
++ac_config_files="$ac_config_files kplato/Makefile"
+
+- ac_config_files="$ac_config_files kplato/pics/Makefile"
++ac_config_files="$ac_config_files kplato/pics/Makefile"
+
+- ac_config_files="$ac_config_files kplato/reports/Makefile"
++ac_config_files="$ac_config_files kplato/reports/Makefile"
+
+- ac_config_files="$ac_config_files kplato/templates/Makefile"
++ac_config_files="$ac_config_files kplato/templates/Makefile"
+
+- ac_config_files="$ac_config_files kplato/templates/Simple/Makefile"
++ac_config_files="$ac_config_files kplato/templates/Simple/Makefile"
+
+- ac_config_files="$ac_config_files kplato/tests/Makefile"
++ac_config_files="$ac_config_files kplato/tests/Makefile"
+
+- ac_config_files="$ac_config_files kplato/toolbar/Makefile"
++ac_config_files="$ac_config_files kplato/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/Makefile"
++ac_config_files="$ac_config_files kpresenter/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/autoformEdit/Makefile"
++ac_config_files="$ac_config_files kpresenter/autoformEdit/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/autoforms/Makefile"
++ac_config_files="$ac_config_files kpresenter/autoforms/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/autoforms/Arrows/Makefile"
++ac_config_files="$ac_config_files kpresenter/autoforms/Arrows/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/autoforms/Connections/Makefile"
++ac_config_files="$ac_config_files kpresenter/autoforms/Connections/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/dtd/Makefile"
++ac_config_files="$ac_config_files kpresenter/dtd/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/pics/Makefile"
++ac_config_files="$ac_config_files kpresenter/pics/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/pics/rotate/Makefile"
++ac_config_files="$ac_config_files kpresenter/pics/rotate/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/slideshow/Makefile"
++ac_config_files="$ac_config_files kpresenter/slideshow/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/A4/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/A4/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/Screen/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/Screen/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/Screenpresentations/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/Screenpresentations/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/common_icon/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/common_icon/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/legal/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/legal/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/templates/letter/Makefile"
++ac_config_files="$ac_config_files kpresenter/templates/letter/Makefile"
+
+- ac_config_files="$ac_config_files kpresenter/toolbar/Makefile"
++ac_config_files="$ac_config_files kpresenter/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files krita/Makefile"
++ac_config_files="$ac_config_files krita/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/cmyk_u16/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/cmyk_u16/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/templates/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/templates/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/gray_u16/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/gray_u16/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/gray_u8/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/gray_u8/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/gray_u8/templates/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/gray_u8/templates/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/gray_u8/tests/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/gray_u8/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/lms_f32/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/lms_f32/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/tests/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/tests/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/tests/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/templates/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/templates/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/tests/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/wet/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/wet/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/wetsticky/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/wetsticky/Makefile"
+
+- ac_config_files="$ac_config_files krita/colorspaces/wetsticky/brushop/Makefile"
++ac_config_files="$ac_config_files krita/colorspaces/wetsticky/brushop/Makefile"
+
+- ac_config_files="$ac_config_files krita/core/Makefile"
++ac_config_files="$ac_config_files krita/core/Makefile"
+
+- ac_config_files="$ac_config_files krita/core/tests/Makefile"
++ac_config_files="$ac_config_files krita/core/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/core/tiles/Makefile"
++ac_config_files="$ac_config_files krita/core/tiles/Makefile"
+
+- ac_config_files="$ac_config_files krita/core/tiles/tests/Makefile"
++ac_config_files="$ac_config_files krita/core/tiles/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/Makefile"
++ac_config_files="$ac_config_files krita/data/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/brushes/Makefile"
++ac_config_files="$ac_config_files krita/data/brushes/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/gradients/Makefile"
++ac_config_files="$ac_config_files krita/data/gradients/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/images/Makefile"
++ac_config_files="$ac_config_files krita/data/images/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/palettes/Makefile"
++ac_config_files="$ac_config_files krita/data/palettes/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/patterns/Makefile"
++ac_config_files="$ac_config_files krita/data/patterns/Makefile"
+
+- ac_config_files="$ac_config_files krita/data/profiles/Makefile"
++ac_config_files="$ac_config_files krita/data/profiles/Makefile"
+
+- ac_config_files="$ac_config_files krita/dtd/Makefile"
++ac_config_files="$ac_config_files krita/dtd/Makefile"
+
+- ac_config_files="$ac_config_files krita/kritacolor/Makefile"
++ac_config_files="$ac_config_files krita/kritacolor/Makefile"
+
+- ac_config_files="$ac_config_files krita/kritacolor/colorspaces/Makefile"
++ac_config_files="$ac_config_files krita/kritacolor/colorspaces/Makefile"
+
+- ac_config_files="$ac_config_files krita/kritacolor/tests/Makefile"
++ac_config_files="$ac_config_files krita/kritacolor/tests/Makefile"
+
+- ac_config_files="$ac_config_files krita/pics/Makefile"
++ac_config_files="$ac_config_files krita/pics/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/Makefile"
++ac_config_files="$ac_config_files krita/plugins/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/bumpmap/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/bumpmap/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/cimg/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/cimg/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/colorsfilters/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/colorsfilters/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/convolutionfilters/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/convolutionfilters/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/cubismfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/cubismfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/embossfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/embossfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/example/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/example/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/imageenhancement/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/imageenhancement/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/oilpaintfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/oilpaintfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/pixelizefilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/pixelizefilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/raindropsfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/raindropsfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/roundcorners/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/roundcorners/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/smalltilesfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/smalltilesfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/sobelfilter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/sobelfilter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/filters/threadtest/Makefile"
++ac_config_files="$ac_config_files krita/plugins/filters/threadtest/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/paintops/Makefile"
++ac_config_files="$ac_config_files krita/plugins/paintops/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/paintops/defaultpaintops/Makefile"
++ac_config_files="$ac_config_files krita/plugins/paintops/defaultpaintops/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/paintops/smearybrush/Makefile"
++ac_config_files="$ac_config_files krita/plugins/paintops/smearybrush/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/defaulttools/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/defaulttools/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/selectiontools/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/selectiontools/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_crop/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_crop/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_filter/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_filter/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_polygon/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_polygon/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_polyline/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_polyline/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_selectsimilar/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_selectsimilar/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_star/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_star/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/tools/tool_transform/Makefile"
++ac_config_files="$ac_config_files krita/plugins/tools/tool_transform/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/colorrange/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/colorrange/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/colorspaceconversion/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/colorspaceconversion/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/dropshadow/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/dropshadow/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/filtersgallery/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/filtersgallery/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram_docker/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram_docker/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/history_docker/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/history_docker/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/imagesize/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/imagesize/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/performancetest/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/performancetest/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/rotateimage/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/rotateimage/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/screenshot/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/screenshot/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritacore/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritacore/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritascripting/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritascripting/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/python/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/python/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/ruby/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/ruby/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/separate_channels/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/separate_channels/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/shearimage/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/shearimage/Makefile"
+
+- ac_config_files="$ac_config_files krita/plugins/viewplugins/variations/Makefile"
++ac_config_files="$ac_config_files krita/plugins/viewplugins/variations/Makefile"
+
+- ac_config_files="$ac_config_files krita/sdk/Makefile"
++ac_config_files="$ac_config_files krita/sdk/Makefile"
+
+- ac_config_files="$ac_config_files krita/ui/Makefile"
++ac_config_files="$ac_config_files krita/ui/Makefile"
+
+- ac_config_files="$ac_config_files kspread/Makefile"
++ac_config_files="$ac_config_files kspread/Makefile"
+
+- ac_config_files="$ac_config_files kspread/dialogs/Makefile"
++ac_config_files="$ac_config_files kspread/dialogs/Makefile"
+
+- ac_config_files="$ac_config_files kspread/dtd/Makefile"
++ac_config_files="$ac_config_files kspread/dtd/Makefile"
+
+- ac_config_files="$ac_config_files kspread/extensions/Makefile"
++ac_config_files="$ac_config_files kspread/extensions/Makefile"
+
+- ac_config_files="$ac_config_files kspread/pics/Makefile"
++ac_config_files="$ac_config_files kspread/pics/Makefile"
+
+- ac_config_files="$ac_config_files kspread/plugins/Makefile"
++ac_config_files="$ac_config_files kspread/plugins/Makefile"
+
+- ac_config_files="$ac_config_files kspread/plugins/calculator/Makefile"
++ac_config_files="$ac_config_files kspread/plugins/calculator/Makefile"
+
+- ac_config_files="$ac_config_files kspread/plugins/calculator/pics/Makefile"
++ac_config_files="$ac_config_files kspread/plugins/calculator/pics/Makefile"
+
+- ac_config_files="$ac_config_files kspread/plugins/insertcalendar/Makefile"
++ac_config_files="$ac_config_files kspread/plugins/insertcalendar/Makefile"
+
+- ac_config_files="$ac_config_files kspread/sheetstyles/Makefile"
++ac_config_files="$ac_config_files kspread/sheetstyles/Makefile"
+
+- ac_config_files="$ac_config_files kspread/templates/Makefile"
++ac_config_files="$ac_config_files kspread/templates/Makefile"
+
+- ac_config_files="$ac_config_files kspread/templates/Business/Makefile"
++ac_config_files="$ac_config_files kspread/templates/Business/Makefile"
+
+- ac_config_files="$ac_config_files kspread/templates/General/Makefile"
++ac_config_files="$ac_config_files kspread/templates/General/Makefile"
+
+- ac_config_files="$ac_config_files kspread/templates/HomeFamily/Makefile"
++ac_config_files="$ac_config_files kspread/templates/HomeFamily/Makefile"
+
+- ac_config_files="$ac_config_files kspread/tests/Makefile"
++ac_config_files="$ac_config_files kspread/tests/Makefile"
+
+- ac_config_files="$ac_config_files kspread/toolbar/Makefile"
++ac_config_files="$ac_config_files kspread/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files kspread/toolbar/crystalsvg/Makefile"
++ac_config_files="$ac_config_files kspread/toolbar/crystalsvg/Makefile"
+
+- ac_config_files="$ac_config_files kugar/Makefile"
++ac_config_files="$ac_config_files kugar/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner/pics/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner/pics/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner/templates/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner/templates/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner/templates/General/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner/templates/General/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner/toolbar/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files kugar/kudesigner_lib/Makefile"
++ac_config_files="$ac_config_files kugar/kudesigner_lib/Makefile"
+
+- ac_config_files="$ac_config_files kugar/lib/Makefile"
++ac_config_files="$ac_config_files kugar/lib/Makefile"
+
+- ac_config_files="$ac_config_files kugar/part/Makefile"
++ac_config_files="$ac_config_files kugar/part/Makefile"
+
+- ac_config_files="$ac_config_files kugar/samples/Makefile"
++ac_config_files="$ac_config_files kugar/samples/Makefile"
+
+- ac_config_files="$ac_config_files kword/Makefile"
++ac_config_files="$ac_config_files kword/Makefile"
+
+- ac_config_files="$ac_config_files kword/data/Makefile"
++ac_config_files="$ac_config_files kword/data/Makefile"
+
+- ac_config_files="$ac_config_files kword/dtd/Makefile"
++ac_config_files="$ac_config_files kword/dtd/Makefile"
+
+- ac_config_files="$ac_config_files kword/expression/Makefile"
++ac_config_files="$ac_config_files kword/expression/Makefile"
+
+- ac_config_files="$ac_config_files kword/horizontalline/Makefile"
++ac_config_files="$ac_config_files kword/horizontalline/Makefile"
+
+- ac_config_files="$ac_config_files kword/mailmerge/Makefile"
++ac_config_files="$ac_config_files kword/mailmerge/Makefile"
+
+- ac_config_files="$ac_config_files kword/mailmerge/kabc/Makefile"
++ac_config_files="$ac_config_files kword/mailmerge/kabc/Makefile"
+
+- ac_config_files="$ac_config_files kword/mailmerge/kspread/Makefile"
++ac_config_files="$ac_config_files kword/mailmerge/kspread/Makefile"
+
+- ac_config_files="$ac_config_files kword/mailmerge/sql/Makefile"
++ac_config_files="$ac_config_files kword/mailmerge/sql/Makefile"
+
+- ac_config_files="$ac_config_files kword/pics/Makefile"
++ac_config_files="$ac_config_files kword/pics/Makefile"
+
+- ac_config_files="$ac_config_files kword/templates/Makefile"
++ac_config_files="$ac_config_files kword/templates/Makefile"
+
+- ac_config_files="$ac_config_files kword/templates/CardsAndLabels/Makefile"
++ac_config_files="$ac_config_files kword/templates/CardsAndLabels/Makefile"
+
+- ac_config_files="$ac_config_files kword/templates/Envelopes/Makefile"
++ac_config_files="$ac_config_files kword/templates/Envelopes/Makefile"
+
+- ac_config_files="$ac_config_files kword/templates/Wordprocessing/Makefile"
++ac_config_files="$ac_config_files kword/templates/Wordprocessing/Makefile"
+
+- ac_config_files="$ac_config_files kword/tests/Makefile"
++ac_config_files="$ac_config_files kword/tests/Makefile"
+
+- ac_config_files="$ac_config_files kword/toolbar/Makefile"
++ac_config_files="$ac_config_files kword/toolbar/Makefile"
+
+- ac_config_files="$ac_config_files lib/Makefile"
++ac_config_files="$ac_config_files lib/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/Makefile"
++ac_config_files="$ac_config_files lib/kformula/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/config/Makefile"
++ac_config_files="$ac_config_files lib/kformula/config/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/dtd/Makefile"
++ac_config_files="$ac_config_files lib/kformula/dtd/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/fonts/Makefile"
++ac_config_files="$ac_config_files lib/kformula/fonts/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/pics/Makefile"
++ac_config_files="$ac_config_files lib/kformula/pics/Makefile"
+
+- ac_config_files="$ac_config_files lib/kformula/pics/crystalsvg/Makefile"
++ac_config_files="$ac_config_files lib/kformula/pics/crystalsvg/Makefile"
+
+- ac_config_files="$ac_config_files lib/kofficecore/Makefile"
++ac_config_files="$ac_config_files lib/kofficecore/Makefile"
+
+- ac_config_files="$ac_config_files lib/kofficecore/tests/Makefile"
++ac_config_files="$ac_config_files lib/kofficecore/tests/Makefile"
+
+- ac_config_files="$ac_config_files lib/kofficeui/Makefile"
++ac_config_files="$ac_config_files lib/kofficeui/Makefile"
+
+- ac_config_files="$ac_config_files lib/kofficeui/pics/Makefile"
++ac_config_files="$ac_config_files lib/kofficeui/pics/Makefile"
+
+- ac_config_files="$ac_config_files lib/kofficeui/tests/Makefile"
++ac_config_files="$ac_config_files lib/kofficeui/tests/Makefile"
+
+- ac_config_files="$ac_config_files lib/kopainter/Makefile"
++ac_config_files="$ac_config_files lib/kopainter/Makefile"
+
+- ac_config_files="$ac_config_files lib/kopalette/Makefile"
++ac_config_files="$ac_config_files lib/kopalette/Makefile"
+
+- ac_config_files="$ac_config_files lib/koproperty/Makefile"
++ac_config_files="$ac_config_files lib/koproperty/Makefile"
+
+- ac_config_files="$ac_config_files lib/koproperty/editors/Makefile"
++ac_config_files="$ac_config_files lib/koproperty/editors/Makefile"
+
+- ac_config_files="$ac_config_files lib/koproperty/test/Makefile"
++ac_config_files="$ac_config_files lib/koproperty/test/Makefile"
+
+- ac_config_files="$ac_config_files lib/kotext/Makefile"
++ac_config_files="$ac_config_files lib/kotext/Makefile"
+
+- ac_config_files="$ac_config_files lib/kotext/kohyphen/Makefile"
++ac_config_files="$ac_config_files lib/kotext/kohyphen/Makefile"
+
+- ac_config_files="$ac_config_files lib/kotext/kohyphen/hyphdicts/Makefile"
++ac_config_files="$ac_config_files lib/kotext/kohyphen/hyphdicts/Makefile"
+
+- ac_config_files="$ac_config_files lib/kotext/tests/Makefile"
++ac_config_files="$ac_config_files lib/kotext/tests/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/Makefile"
++ac_config_files="$ac_config_files lib/kross/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/api/Makefile"
++ac_config_files="$ac_config_files lib/kross/api/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/main/Makefile"
++ac_config_files="$ac_config_files lib/kross/main/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/python/Makefile"
++ac_config_files="$ac_config_files lib/kross/python/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/python/CXX/Makefile"
++ac_config_files="$ac_config_files lib/kross/python/CXX/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/python/scripts/Makefile"
++ac_config_files="$ac_config_files lib/kross/python/scripts/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/python/scripts/RestrictedPython/Makefile"
++ac_config_files="$ac_config_files lib/kross/python/scripts/RestrictedPython/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/ruby/Makefile"
++ac_config_files="$ac_config_files lib/kross/ruby/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/runner/Makefile"
++ac_config_files="$ac_config_files lib/kross/runner/Makefile"
+
+- ac_config_files="$ac_config_files lib/kross/test/Makefile"
++ac_config_files="$ac_config_files lib/kross/test/Makefile"
+
+- ac_config_files="$ac_config_files lib/kwmf/Makefile"
++ac_config_files="$ac_config_files lib/kwmf/Makefile"
+
+- ac_config_files="$ac_config_files lib/store/Makefile"
++ac_config_files="$ac_config_files lib/store/Makefile"
+
+- ac_config_files="$ac_config_files lib/store/tests/Makefile"
++ac_config_files="$ac_config_files lib/store/tests/Makefile"
+
+- ac_config_files="$ac_config_files mimetypes/Makefile"
++ac_config_files="$ac_config_files mimetypes/Makefile"
+
+- ac_config_files="$ac_config_files mimetypes/kde33/Makefile"
++ac_config_files="$ac_config_files mimetypes/kde33/Makefile"
+
+- ac_config_files="$ac_config_files mimetypes/kde351/Makefile"
++ac_config_files="$ac_config_files mimetypes/kde351/Makefile"
+
+- ac_config_files="$ac_config_files pics/Makefile"
++ac_config_files="$ac_config_files pics/Makefile"
+
+- ac_config_files="$ac_config_files pics/crystalsvg/Makefile"
++ac_config_files="$ac_config_files pics/crystalsvg/Makefile"
+
+- ac_config_files="$ac_config_files plugins/Makefile"
++ac_config_files="$ac_config_files plugins/Makefile"
+
+- ac_config_files="$ac_config_files plugins/scan/Makefile"
++ac_config_files="$ac_config_files plugins/scan/Makefile"
+
+- ac_config_files="$ac_config_files servicetypes/Makefile"
++ac_config_files="$ac_config_files servicetypes/Makefile"
+
+- ac_config_files="$ac_config_files templates/Makefile"
++ac_config_files="$ac_config_files templates/Makefile"
+
+- ac_config_files="$ac_config_files tools/Makefile"
++ac_config_files="$ac_config_files tools/Makefile"
+
+- ac_config_files="$ac_config_files tools/converter/Makefile"
++ac_config_files="$ac_config_files tools/converter/Makefile"
+
+- ac_config_files="$ac_config_files tools/kfile-plugins/Makefile"
++ac_config_files="$ac_config_files tools/kfile-plugins/Makefile"
+
+- ac_config_files="$ac_config_files tools/kfile-plugins/abiword/Makefile"
++ac_config_files="$ac_config_files tools/kfile-plugins/abiword/Makefile"
+
+- ac_config_files="$ac_config_files tools/kfile-plugins/gnumeric/Makefile"
++ac_config_files="$ac_config_files tools/kfile-plugins/gnumeric/Makefile"
+
+- ac_config_files="$ac_config_files tools/kfile-plugins/koffice/Makefile"
++ac_config_files="$ac_config_files tools/kfile-plugins/koffice/Makefile"
+
+- ac_config_files="$ac_config_files tools/kfile-plugins/ooo/Makefile"
++ac_config_files="$ac_config_files tools/kfile-plugins/ooo/Makefile"
+
+- ac_config_files="$ac_config_files tools/kthesaurus/Makefile"
++ac_config_files="$ac_config_files tools/kthesaurus/Makefile"
+
+- ac_config_files="$ac_config_files tools/quickprint/Makefile"
++ac_config_files="$ac_config_files tools/quickprint/Makefile"
+
+- ac_config_files="$ac_config_files tools/spell/Makefile"
++ac_config_files="$ac_config_files tools/spell/Makefile"
+
+- ac_config_files="$ac_config_files tools/thesaurus/Makefile"
++ac_config_files="$ac_config_files tools/thesaurus/Makefile"
+
+- ac_config_files="$ac_config_files tools/thumbnail/Makefile"
++ac_config_files="$ac_config_files tools/thumbnail/Makefile"
+
+-echo "$as_me:$LINENO: checking for filters to be compiled" >&5
+-echo $ECHO_N "checking for filters to be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for filters to be compiled" >&5
++echo $ECHO_N "checking for filters to be compiled... $ECHO_C" >&6; }
+
+ if test -s $srcdir/inst-apps ; then
+ SUBDIRLIST=`cat $srcdir/inst-apps`
+@@ -58479,8 +64300,8 @@
+ done
+
+ USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR"
+-echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILE" >&5
+-echo "${ECHO_T}$USERFEEDBACKCOMPILE" >&6
++{ echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILE" >&5
++echo "${ECHO_T}$USERFEEDBACKCOMPILE" >&6; }
+
+
+
+@@ -58619,8 +64440,8 @@
+ SUBDIRLIST=`ls -1 $srcdir`
+ fi
+
+-echo "$as_me:$LINENO: checking whether only Kexi is being built" >&5
+-echo $ECHO_N "checking whether only Kexi is being built... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether only Kexi is being built" >&5
++echo $ECHO_N "checking whether only Kexi is being built... $ECHO_C" >&6; }
+ KEXI_ONLY=yes
+ for args in $SUBDIRLIST ; do
+ case $args in
+@@ -58632,8 +64453,8 @@
+ ;;
+ esac
+ done
+-echo "$as_me:$LINENO: result: $KEXI_ONLY" >&5
+-echo "${ECHO_T}$KEXI_ONLY" >&6
++{ echo "$as_me:$LINENO: result: $KEXI_ONLY" >&5
++echo "${ECHO_T}$KEXI_ONLY" >&6; }
+
+
+ if test "$KEXI_ONLY" = "yes" ; then
+@@ -58645,8 +64466,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether kopainter should be compiled" >&5
+-echo $ECHO_N "checking whether kopainter should be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether kopainter should be compiled" >&5
++echo $ECHO_N "checking whether kopainter should be compiled... $ECHO_C" >&6; }
+
+
+ # first check which main application we could compile
+@@ -58673,8 +64494,8 @@
+ USERFEEDBACKCOMPILELIB="no"
+ fi
+
+-echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILELIB" >&5
+-echo "${ECHO_T}$USERFEEDBACKCOMPILELIB" >&6
++{ echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILELIB" >&5
++echo "${ECHO_T}$USERFEEDBACKCOMPILELIB" >&6; }
+
+
+
+@@ -58705,39 +64526,58 @@
+
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
++
+ (set) 2>&1 |
+- case `(ac_space=' '; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space=' '; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+- ;;
++ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-} |
++ esac |
++ sort
++) |
+ sed '
++ /^ac_cv_env_/b end
+ t clear
+- : clear
++ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+- : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+- if test -w $cache_file; then
+- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++ :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++ if test -w "$cache_file"; then
++ test "x$cache_file" != "x/dev/null" &&
++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+- echo "not updating unwritable cache $cache_file"
++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -58746,38 +64586,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[ ]*$//;
+-}'
-fi
--dnl =======================================================
--dnl FILE: ./krita/plugins/configure.in.in
--dnl =======================================================
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+kdeversion_save_CXXFLAGS="$CXXFLAGS"
-+kdeversion_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CXXFLAGS="$CXXFLAGS $all_includes"
+-
+ DEFS=-DHAVE_CONFIG_H
--KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no)
--AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes)
--dnl =======================================================
--dnl FILE: ./krita/plugins/viewplugins/imagesize/configure.in.in
--dnl =======================================================
-+AC_COMPILE_IFELSE([
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
-+#error KDE 3.2
-+#endif
-+],
-+ need_kde32_compat="no"
-+,
-+ need_kde32_compat="yes"
-+)
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+- ac_i=`echo "$ac_i" |
+- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+- # 2. Add them.
+- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++ ac_i=`echo "$ac_i" | sed "$ac_script"`
++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
++ # will be set to the directory where LIBOBJS objects are built.
++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
--AC_CHECK_DECLS([round], [], [], [#include <math.h>])
--dnl =======================================================
--dnl FILE: ./kspread/plugins/calculator/configure.in.in
--dnl =======================================================
-+AC_COMPILE_IFELSE([
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
-+#error KDE 3.3
-+#endif
-+],
-+ need_kde33_compat="no"
-+,
-+ need_kde33_compat="yes"
-+)
+ LTLIBOBJS=$ac_ltlibobjs
--AC_CHECK_HEADERS(ieeefp.h)
-+AC_COMPILE_IFELSE([
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
-+#error KDE 3.4
-+#endif
-+],
-+ need_kde34_compat="no"
-+,
-+ need_kde34_compat="yes"
-+)
--AC_CHECK_FUNCS(fabsl)
-+AC_COMPILE_IFELSE([
-+#include <kdeversion.h>
-+#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
-+#error KDE 3.5.x (x < 2)
-+#endif
-+],
-+ need_kde351_compat="no"
-+,
-+ need_kde351_compat="yes"
-+)
-+CXXFLAGS="$kdeversion_save_CXXFLAGS"
-+LIBS="$kdeversion_safe_LIBS"
-+AC_LANG_RESTORE
-+
-+if test "$need_kde32_compat" = "yes"; then
-+ AC_MSG_RESULT([KDE 3.2.x])
-+else
-+ if test "$need_kde33_compat" = "yes"; then
-+ AC_MSG_RESULT([KDE 3.3.x])
-+ else
-+ if test "$need_kde34_compat" = "yes"; then
-+ AC_MSG_RESULT([KDE 3.4.x])
-+ else
-+ if test "$need_kde351_compat" = "yes"; then
-+ AC_MSG_RESULT([KDE 3.5.x (x < 2)])
-+ else
-+ AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
-+ fi
-+ fi
-+ fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
+fi
-+
-+AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
-+AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
-+AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes")
-+AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes")
-+
-+# Keep the old KDE 3.1 test, as long as it is still used
-+AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no")
-+
-+# --- End KDE 3.2 check ---
-+
-+# --- OpenEXR check ---
-+
-+KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find pkg-config])
-+])
-+
-+AC_MSG_CHECKING([for OpenEXR])
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`"
-+ OPENEXR_RPATH=
-+ for args in $OPENEXR_LIBS; do
-+ case $args in
-+ -L*)
-+ OPENEXR_RPATH="$OPENEXR_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"`
-+ OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_OPENEXR, 1, [Defines if your system has the OpenEXR library])
-+ fi
-+fi
-+
-+if test ! "$USE_RPATH" = "yes"; then
-+ OPENEXR_RPATH=
-+fi
-+
-+if test -n "$OPENEXR_LIBS"
-+then
-+ AC_MSG_RESULT([yes])
+ 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
+@@ -59306,11 +65139,35 @@
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
+else
-+ AC_MSG_RESULT([not found])
-+fi
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+
+
-+AC_SUBST(OPENEXR_LIBS)
-+AC_SUBST(OPENEXR_CFLAGS)
-+AC_SUBST(OPENEXR_RPATH)
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+
-+AM_CONDITIONAL(have_openexr, test -n "$OPENEXR_LIBS")
-+
-+# --- End of OpenEXR check ---
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/example/configure.in.in
-+dnl =======================================================
-+
-+dnl This is here so that example isn't compiled and intalled by default.
-+dnl Do NOT put this file in your application, if you want it compiled !
-+
-+DO_NOT_COMPILE="$DO_NOT_COMPILE example"
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/filters/krita/configure.in.in
-+dnl =======================================================
-+
-+# Check if the tiff lib is available
-+AC_FIND_TIFF
-+AM_CONDITIONAL(have_tiff, test -n "$LIBTIFF")
-+
-+AC_FIND_PNG
-+AM_CONDITIONAL(have_png, test -n "$LIBPNG")
-+
-+AC_FIND_JPEG
-+AM_CONDITIONAL(have_jpeg, test -n "$LIBJPEG")
-+
-+#---------------------------------------------------------
-+# libexif detection
-+# taken from libkexif's configure.in.in
-+#---------------------------------------------------------
-+
-+LIBEXIF=no
-+
-+#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, ,
-+# [ AC_MSG_WARN([libexif >= 0.5.7 not found.])
-+# LIBEXIF=yes ])
-+
-+
-+#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9,
-+# AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]),
-+# AC_MSG_WARN([Using old version of libexif.]))
-+
-+PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.12 , ,
-+ [ AC_MSG_WARN([libexif >= 0.6.12 not found.])
-+ LIBEXIF=yes ])
-+
-+AC_SUBST(LIBEXIF_LIBS)
-+AC_SUBST(LIBEXIF_CFLAGS)
-+
-+#---------------------------------------------------------
-+# libexif detection
-+#---------------------------------------------------------
-+AC_MSG_CHECKING([if C++ program with exif can be compiled])
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
-+AC_CACHE_VAL(exif_build,
-+[
-+ AC_TRY_COMPILE([
-+ extern "C" {
-+#include <libexif/exif-loader.h>
-+#include <libexif/exif-utils.h>
-+}
-+ ],[
-+ ExifLoader *l = exif_loader_new ();
-+ exif_loader_write_file (l,"kikoo");
-+ return 0;
-+ ], exif_build=yes,
-+ exif_build=no)
-+])
-+AC_MSG_RESULT($exif_build)
-+if test "$exif_build" = "no"; then
-+ LIBEXIF=""
-+fi
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+
-+
-+AM_CONDITIONAL(have_exif, test -n "$LIBEXIF")
-+AM_CONDITIONAL(include_jpeg_filter, test -n "$LIBJPEG" -a -n "$LIBEXIF")
-+AM_CONDITIONAL(include_tiff_filter, test -n "$LIBTIFF" -a -n "$LIBEXIF")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/filters/kword/msword/configure.in.in
-+dnl =======================================================
-+
-+AC_ARG_WITH(libwv2,AC_HELP_STRING([--with-libwv2=DIR],[use libwv2 in DIR]),[
-+ if [ test "x$withval" != "xno" ]; then
-+ if [ test "x$withval" != "xyes" ]; then
-+ WV2_DIR=$withval
-+ fi
-+ search_for_wv2=yes
-+ else
-+ search_for_wv2=no
-+ fi
-+],[ search_for_wv2=yes
-+])
-+
-+if [ test $search_for_wv2 != no ]; then
-+ if [ test -n "$WV2_DIR" ]; then
-+ KDE_FIND_PATH(wv2-config, WV2_CONFIG, [$WV2_DIR/bin], [
-+ AC_MSG_WARN([Could not find libwv2, check http://www.sourceforge.net/projects/wvware/])
-+ ])
-+ else
-+ KDE_FIND_PATH(wv2-config, WV2_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/])
-+ ])
-+ fi
-+fi
-+
-+if test -n "$WV2_CONFIG"; then
-+ vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1009
-+ then
-+ LIBWV2_LIBS="`$WV2_CONFIG --libs`"
-+ LIBWV2_RPATH=
-+ for args in $LIBWV2_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWV2_RPATH="$LIBWV2_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_WV2, 1, [Defines if your system has the wv2 library])
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
+ else
-+ AC_MSG_WARN([You need at least version 0.1.9 of libwv2])
++ PATH_SEPARATOR=:
+ fi
++ rm -f conf$$.sh
+fi
+
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+@@ -59319,8 +65176,43 @@
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
+
-+AC_SUBST(LIBWV2_LIBS)
-+AC_SUBST(LIBWV2_CFLAGS)
-+AC_SUBST(LIBWV2_RPATH)
-+AM_CONDITIONAL(include_wv2_msword_filter, test -n "$LIBWV2_LIBS")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/filters/kword/pdf/xpdf/configure.in.in
-+dnl =======================================================
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
+
-+
-+AC_HEADER_DIRENT
-+AC_HEADER_STDC
-+AC_CHECK_FUNCS(rewinddir popen mkstemp)
-+
-+dnl ##### Check for fseeko/ftello or fseek64/ftell64
-+dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
-+AC_SYS_LARGEFILE
-+AC_FUNC_FSEEKO
-+AC_CHECK_FUNCS(fseek64)
-+AC_CHECK_FUNCS(ftell64)
-+
-+dnl ##### Check for libpaper (Debian).
-+KDE_CHECK_HEADERS(paper.h)
-+KDE_CHECK_LIB(paper, paperinit, [LIBPAPER="-lpaper"])
-+AC_SUBST(LIBPAPER)
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/filters/kword/wordperfect/configure.in.in
-+dnl =======================================================
-+
-+KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find pkg-config])
-+])
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
-+ if test -n "$vers"
-+ then
-+ LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
-+ LIBWPD_RPATH=
-+ for args in $LIBWPD_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBWPD_RPATH="$LIBWPD_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
-+ fi
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
+fi
-+
-+
-+AC_SUBST(LIBWPD_LIBS)
-+AC_SUBST(LIBWPD_CFLAGS)
-+AC_SUBST(LIBWPD_RPATH)
-+
-+AM_CONDITIONAL(include_wpd_filter, test -n "$LIBWPD_LIBS")
-+
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/filters/xsltfilter/configure.in.in
-+dnl =======================================================
-+
-+
-+KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
-+ HELP_SUBDIR=
-+])
-+
-+if test -n "$XML_CONFIG"; then
-+ vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2004008
-+ then
-+ LIBXML_LIBS="`$XML_CONFIG --libs`"
-+ LIBXML_RPATH=
-+ for args in $LIBXML_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXML_RPATH="$LIBXML_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+
-+ KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
-+ AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint])
-+ else
-+ AC_MSG_WARN([You need at least libxml 2.4.8])
-+ HELP_SUBDIR=
-+ fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
+fi
+
-+KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
-+ HELP_SUBDIR=
-+])
-+
-+if test -n "$XSLT_CONFIG"; then
-+ vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000007; then
-+ LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-+ LIBXSLT_RPATH=
-+ for args in $LIBXSLT_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-+
-+ else
-+ AC_MSG_WARN([You need at least libxslt 1.0.7])
-+ HELP_SUBDIR=
-+ fi
-+fi
-+
-+if test ! "$USE_RPATH" = "yes"; then
-+ LIBXSLT_RPATH=
-+ LIBXML_RPATH=
-+fi
-+
-+AC_SUBST(LIBXSLT_LIBS)
-+AC_SUBST(LIBXSLT_CFLAGS)
-+AC_SUBST(LIBXSLT_RPATH)
-+
-+AC_SUBST(LIBXML_LIBS)
-+AC_SUBST(LIBXML_CFLAGS)
-+AC_SUBST(LIBXML_RPATH)
-+
-+AM_CONDITIONAL(include_XSLTFILTERS, test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/karbon/configure.in.in
-+dnl =======================================================
-+
-+
-+KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find libfreetype anywhere, check http://www.freetype.org/])
-+])
-+
-+if test -n "$FREETYPE_CONFIG"; then
-+ vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 5000000
-+ then
-+ LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-+ LIBFREETYPE_RPATH=
-+ for args in $LIBFREETYPE_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-+ else
-+ AC_MSG_WARN([You need at least libfreetype 5.0])
-+ fi
-+fi
-+
-+AC_SUBST(LIBFREETYPE_LIBS)
-+AC_SUBST(LIBFREETYPE_CFLAGS)
-+AC_SUBST(LIBFREETYPE_RPATH)
-+
-+
-+KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+])
-+
-+if test -n "$LIBART_CONFIG"; then
-+ vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2003008
-+ then
-+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+ LIBART_RPATH=
-+ for args in $LIBART_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBART_RPATH="$LIBART_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+ else
-+ AC_MSG_WARN([You need at least libart 2.3.8])
-+ fi
-+fi
-+
-+AC_SUBST(LIBART_LIBS)
-+AC_SUBST(LIBART_CFLAGS)
-+AC_SUBST(LIBART_RPATH)
-+
-+
-+# Check for fontconfig
-+KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
-+ AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
-+ ])
-+])
-+
-+if test -n "$PKGCONFIG"; then
-+ vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
-+ fi
-+fi
-+
-+if test -n "$FONTCONFIG_CONFIG"; then
-+ vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 1000001
-+ then
-+ LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
-+ LIBFONTCONFIG_RPATH=
-+ for args in $LIBFONTCONFIG_LIBS; do
-+ case $args in
-+ -L*)
-+ LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
-+ ;;
-+ esac
-+ done
-+ LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
-+ LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-+
-+ AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
-+ fi
-+fi
-+
-+AC_SUBST(LIBFONTCONFIG_LIBS)
-+AC_SUBST(LIBFONTCONFIG_CFLAGS)
-+AC_SUBST(LIBFONTCONFIG_RPATH)
-+
-+if test -z "$LIBART_LIBS"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
-+fi
-+
-+if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
-+ AC_DEFINE_UNQUOTED(HAVE_KARBONTEXT, 1, [Defines if your system has the fontconfig and freetype libraries])
-+fi
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/3rdparty/configure.in.in
-+dnl =======================================================
-+
-+dnl This is copied from gpsim-0.21.1/acinclude.m4, which was itself
-+dnl copied from the NcFTP distribution.
-+dnl Modified by David Faure <faure at kde.org> for kexi's purposes.
-+dnl
-+dnl Original author Mike Gleason mgleason at NcFTP.com
-+dnl
-+dnl
-+AC_DEFUN([kexi_LIB_READLINE], [
-+AC_MSG_CHECKING([for Readline library])
-+
-+kexi_cv_lib_readline=no
-+ac_save_LIBS="$LIBS"
-+# Note: $LIBCURSES is permitted to be empty.
-+for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
-+do
-+ LIBS="$ac_save_LIBS $LIBREADLINE"
-+ AC_TRY_RUN([
-+ /* program */
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <readline/readline.h>
-+
-+main(int argc, char **argv)
-+{
-+ /* Note: don't actually call readline, since it may block;
-+ * We just want to see if it (dynamic) linked in okay.
-+ */
-+ if (argc == 0) /* never true */
-+ readline(0);
-+ exit(0);
-+}
-+],[
-+ # action if true
-+ kexi_cv_lib_readline=yes
-+],[
-+ # action if false
-+ kexi_cv_lib_readline=no
-+],[
-+ # action if cross compiling
-+ kexi_cv_lib_readline=no
-+])
-+
-+ if test "$kexi_cv_lib_readline" = yes ; then break ; fi
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
-+# restore LIBS
-+LIBS="$ac_save_LIBS"
-+
-+if test "$kexi_cv_lib_readline" = no ; then
-+ LIBREADLINE=""
-+ AC_MSG_RESULT("not found - kexisql will not be compiled")
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -59334,18 +65226,19 @@
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+ done
+
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+@@ -59353,159 +65246,120 @@
+
+
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
+- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++ chmod +x "$as_me.lineno" ||
++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
+else
-+ AC_MSG_RESULT($LIBREADLINE)
-+ AC_DEFINE(HAVE_READLINE, 1, [define if you have libreadline available])
++ as_dirname=false
+fi
+
-+AM_CONDITIONAL(have_readline, test "$kexi_cv_lib_readline" = "yes")
-+AC_SUBST(LIBREADLINE)
-+])
-+
-+kexi_LIB_READLINE
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/configure.in.in
-+dnl =======================================================
-+
-+
-+#KEXI_VERSION=
-+AC_SUBST(LIB_KEXI_KMDI, '-lkmdi')
-+AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '')
-+
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/kexidb/drivers/configure.in.in
-+dnl =======================================================
-+
-+dnl ========================================
-+dnl checks for MySQL
-+dnl taken form KDEDB
-+dnl ========================================
-+
-+AC_ARG_ENABLE(mysql,
-+ AC_HELP_STRING([--enable-mysql],[build MySQL-plugin [default=yes]]),
-+ mysql_plugin=$enableval, mysql_plugin=yes)
-+
-+if test "x$mysql_plugin" = "xyes"; then
-+ compile_mysql_plugin="yes"
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
+else
-+ compile_mysql_plugin="no"
++ rm -f conf$$.dir
++ mkdir conf$$.dir
+fi
-+
-+AC_ARG_WITH(mysql_includes,
-+AC_HELP_STRING([--with-mysql-includes=DIR],[use MySQL-includes installed in this directory]),
-+[
-+ ac_mysql_incdir=$withval
-+], ac_mysql_incdir=
-+)
-+
-+AC_ARG_WITH(mysql_libraries,
-+AC_HELP_STRING([--with-mysql-libraries=DIR],[use MySQL-libs installed in this directory ]),
-+[
-+ ac_mysql_libdir=$withval
-+], ac_mysql_libdir=
-+)
-+
-+dnl ==============================================
-+dnl check whether MySQL should be compiled
-+dnl and where headers and libraries are installed
-+dnl if present compile mysql-plugin
-+dnl ==============================================
-+
-+AC_MSG_CHECKING([for MySQL])
-+
-+if test "$compile_mysql_plugin" = "yes"; then
-+ if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
-+dnl *** Configure arguments for includes or libs given ***
-+dnl *** and MySQL not explicitly disabled. ***
-+dnl *** Check that the paths given to configure are valid ***
-+ AC_MSG_CHECKING([for MySQL headers])
-+ mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
-+ AC_FIND_FILE(mysql/mysql.h, $mysql_incdirs, mysql_incdir)
-+ if test -r $mysql_incdir/mysql/mysql.h; then
-+ MYSQL_INC=$mysql_incdir
-+ AC_MSG_RESULT([$MYSQL_INC])
-+ AC_SUBST(MYSQL_INC)
-+ else
-+ compile_mysql_plugin="no"
-+ AC_MSG_RESULT([not found])
-+ fi
-+
-+ AC_MSG_CHECKING([for MySQL libraries])
-+ mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+ AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir)
-+ if test -r $mysql_libdir/mysql/libmysqlclient.so; then
-+ MYSQL_LIBS=$mysql_libdir
-+ AC_MSG_RESULT([$MYSQL_LIBS])
-+ AC_SUBST(MYSQL_LIBS)
-+ else
-+ compile_mysql_plugin="no"
-+ AC_MSG_RESULT([not found])
-+ fi
-+ else
-+dnl *** No configure arguments for includes or libs given ***
-+dnl *** and MySQL not explicitly disabled. ***
-+ KDE_FIND_PATH(mysql_config, MYSQL_CONFIG,
-+ [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [
-+ AC_MSG_RESULT([not found])
-+ ])
-+
-+ if test -n "$MYSQL_CONFIG"; then
-+ mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1`
-+ mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
-+ MYSQL_INC=$mysql_incdir
-+ MYSQL_LIBS=$mysql_libdir
-+ AC_SUBST(MYSQL_INC)
-+ AC_SUBST(MYSQL_LIBS)
-+ compile_mypsql_plugin="yes"
-+ AC_MSG_RESULT([headers $mysql_incdir, libraries $mysql_libdir])
-+ else
-+ compile_mysql_plugin="no"
-+ fi
-+ fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+@@ -59514,7 +65368,19 @@
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works. Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ as_executable_p="test -x"
+else
-+dnl *** MySQL plugin explicitly disabled. ***
-+dnl *** Show that we are doing as requested. ***
-+ AC_MSG_NOTICE([Not attempting to configure MySQL as requested])
++ as_executable_p=:
+fi
++rm -f conf$$.file
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -59523,31 +65389,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling. Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+- echo
+- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.59e. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -59555,30 +65404,20 @@
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
+
-+AM_CONDITIONAL(compile_mysql_plugin, test "$compile_mysql_plugin" = "yes")
+ _ACEOF
+
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+
+-if test -n "$ac_config_headers"; then
+- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_commands"; then
+- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -59605,19 +65444,21 @@
+ $config_commands
+
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
+- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.59e,
++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
+
-+dnl ========================================
-+dnl Checks for PostgreSQL
-+dnl ========================================
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -59628,39 +65469,24 @@
+ do
+ case $1 in
+ --*=*)
+- ac_option=`expr "x$1" : 'x\([^=]*\)='`
+- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+- -*)
++ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+- *) # This is not an option, so the user has probably given explicit
+- # arguments.
+- ac_option=$1
+- ac_need_defaults=false;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+- --version | --vers* | -V )
+- echo "$ac_cs_version"; exit 0 ;;
+- --he | --h)
+- # Conflict between --help and --header
+- { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+- { (exit 1); exit 1; }; };;
+- --help | --hel | -h )
+- echo "$ac_cs_usage"; exit 0 ;;
+- --debug | --d* | -d )
++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++ echo "$ac_cs_version"; exit ;;
++ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+@@ -59670,18 +65496,24 @@
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
++ --he | --h)
++ # Conflict between --help and --header
++ { echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++ { (exit 1); exit 1; }; };;
++ --help | --hel | -h )
++ echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++ -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+- *) ac_config_targets="$ac_config_targets $1" ;;
++ *) ac_config_targets="$ac_config_targets $1"
++ ac_need_defaults=false ;;
+
+ esac
+ shift
+@@ -59697,539 +65529,551 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ CONFIG_SHELL=$SHELL
++ export CONFIG_SHELL
++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++exec 5>>config.log
++{
++ echo
++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++ echo "$ac_log"
++} >&5
+
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+ _ACEOF
+
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
+
-+dnl ========================================
-+dnl libpq
-+dnl Add configure-args
-+dnl ========================================
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+- case "$ac_config_target" in
+- # Handling of arguments.
+- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "autocorrect/Makefile" ) CONFIG_FILES="$CONFIG_FILES autocorrect/Makefile" ;;
+- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+- "doc/karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/karbon/Makefile" ;;
+- "doc/kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kchart/Makefile" ;;
+- "doc/kexi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kexi/Makefile" ;;
+- "doc/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kformula/Makefile" ;;
+- "doc/kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kivio/Makefile" ;;
+- "doc/koffice/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/koffice/Makefile" ;;
+- "doc/koshell/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/koshell/Makefile" ;;
+- "doc/kplato/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kplato/Makefile" ;;
+- "doc/kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpresenter/Makefile" ;;
+- "doc/krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/krita/Makefile" ;;
+- "doc/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kspread/Makefile" ;;
+- "doc/kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kugar/Makefile" ;;
+- "doc/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kword/Makefile" ;;
+- "doc/thesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/thesaurus/Makefile" ;;
+- "example/Makefile" ) CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
+- "filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/Makefile" ;;
+- "filters/generic_wrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/generic_wrapper/Makefile" ;;
+- "filters/karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/Makefile" ;;
+- "filters/karbon/ai/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/ai/Makefile" ;;
+- "filters/karbon/applixgraphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/applixgraphics/Makefile" ;;
+- "filters/karbon/eps/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/eps/Makefile" ;;
+- "filters/karbon/kontour/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/kontour/Makefile" ;;
+- "filters/karbon/msod/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/msod/Makefile" ;;
+- "filters/karbon/oodraw/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/oodraw/Makefile" ;;
+- "filters/karbon/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/png/Makefile" ;;
+- "filters/karbon/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/svg/Makefile" ;;
+- "filters/karbon/wmf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/wmf/Makefile" ;;
+- "filters/karbon/xaml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/xaml/Makefile" ;;
+- "filters/karbon/xcf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/xcf/Makefile" ;;
+- "filters/kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/Makefile" ;;
+- "filters/kchart/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/bmp/Makefile" ;;
+- "filters/kchart/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/jpeg/Makefile" ;;
+- "filters/kchart/libimageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/libimageexport/Makefile" ;;
+- "filters/kchart/mng/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/mng/Makefile" ;;
+- "filters/kchart/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/png/Makefile" ;;
+- "filters/kchart/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/svg/Makefile" ;;
+- "filters/kchart/xbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/xbm/Makefile" ;;
+- "filters/kchart/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/xpm/Makefile" ;;
+- "filters/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/Makefile" ;;
+- "filters/kformula/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/latex/Makefile" ;;
+- "filters/kformula/mathml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/mathml/Makefile" ;;
+- "filters/kformula/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/png/Makefile" ;;
+- "filters/kformula/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/svg/Makefile" ;;
+- "filters/kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kivio/Makefile" ;;
+- "filters/kivio/imageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kivio/imageexport/Makefile" ;;
+- "filters/kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/Makefile" ;;
+- "filters/kpresenter/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/bmp/Makefile" ;;
+- "filters/kpresenter/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/jpeg/Makefile" ;;
+- "filters/kpresenter/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/kword/Makefile" ;;
+- "filters/kpresenter/libimageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/libimageexport/Makefile" ;;
+- "filters/kpresenter/magicpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/magicpoint/Makefile" ;;
+- "filters/kpresenter/mng/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/mng/Makefile" ;;
+- "filters/kpresenter/ooimpress/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/ooimpress/Makefile" ;;
+- "filters/kpresenter/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/png/Makefile" ;;
+- "filters/kpresenter/powerpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/Makefile" ;;
+- "filters/kpresenter/powerpoint/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/import/Makefile" ;;
+- "filters/kpresenter/powerpoint/libppt/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/libppt/Makefile" ;;
+- "filters/kpresenter/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/svg/Makefile" ;;
+- "filters/kpresenter/xbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xbm/Makefile" ;;
+- "filters/kpresenter/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xpm/Makefile" ;;
+- "filters/krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/Makefile" ;;
+- "filters/krita/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/jpeg/Makefile" ;;
+- "filters/krita/libkisexif/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/libkisexif/Makefile" ;;
+- "filters/krita/magick/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/magick/Makefile" ;;
+- "filters/krita/openexr/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/openexr/Makefile" ;;
+- "filters/krita/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/png/Makefile" ;;
+- "filters/krita/raw/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/raw/Makefile" ;;
+- "filters/krita/tiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/tiff/Makefile" ;;
+- "filters/krita/xcf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/xcf/Makefile" ;;
+- "filters/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/Makefile" ;;
+- "filters/kspread/applixspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/applixspread/Makefile" ;;
+- "filters/kspread/csv/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/csv/Makefile" ;;
+- "filters/kspread/dbase/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/dbase/Makefile" ;;
+- "filters/kspread/excel/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/Makefile" ;;
+- "filters/kspread/excel/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/import/Makefile" ;;
+- "filters/kspread/excel/sidewinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/sidewinder/Makefile" ;;
+- "filters/kspread/gnumeric/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/gnumeric/Makefile" ;;
+- "filters/kspread/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/html/Makefile" ;;
+- "filters/kspread/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/Makefile" ;;
+- "filters/kspread/latex/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/export/Makefile" ;;
+- "filters/kspread/libkspreadexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/libkspreadexport/Makefile" ;;
+- "filters/kspread/opencalc/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/opencalc/Makefile" ;;
+- "filters/kspread/qpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/Makefile" ;;
+- "filters/kspread/qpro/libqpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/Makefile" ;;
+- "filters/kspread/qpro/libqpro/qpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/qpro/Makefile" ;;
+- "filters/kspread/qpro/libqpro/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/src/Makefile" ;;
+- "filters/kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kugar/Makefile" ;;
+- "filters/kugar/kugarnop/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kugar/kugarnop/Makefile" ;;
+- "filters/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/Makefile" ;;
+- "filters/kword/abiword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/abiword/Makefile" ;;
+- "filters/kword/amipro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/amipro/Makefile" ;;
+- "filters/kword/applixword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/applixword/Makefile" ;;
+- "filters/kword/ascii/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/ascii/Makefile" ;;
+- "filters/kword/docbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/docbook/Makefile" ;;
+- "filters/kword/hancomword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/hancomword/Makefile" ;;
+- "filters/kword/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/Makefile" ;;
+- "filters/kword/html/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/export/Makefile" ;;
+- "filters/kword/html/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/import/Makefile" ;;
+- "filters/kword/kword1.3/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/Makefile" ;;
+- "filters/kword/kword1.3/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/import/Makefile" ;;
+- "filters/kword/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/Makefile" ;;
+- "filters/kword/latex/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/export/Makefile" ;;
+- "filters/kword/latex/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/Makefile" ;;
+- "filters/kword/latex/import/generator/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/generator/Makefile" ;;
+- "filters/kword/latex/import/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/parser/Makefile" ;;
+- "filters/kword/libexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/libexport/Makefile" ;;
+- "filters/kword/msword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/msword/Makefile" ;;
+- "filters/kword/mswrite/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/mswrite/Makefile" ;;
+- "filters/kword/oowriter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/oowriter/Makefile" ;;
+- "filters/kword/palmdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/palmdoc/Makefile" ;;
+- "filters/kword/pdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/Makefile" ;;
+- "filters/kword/pdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/Makefile" ;;
+- "filters/kword/pdf/xpdf/goo/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/goo/Makefile" ;;
+- "filters/kword/pdf/xpdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/xpdf/Makefile" ;;
+- "filters/kword/rtf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/Makefile" ;;
+- "filters/kword/rtf/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/export/Makefile" ;;
+- "filters/kword/rtf/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/import/Makefile" ;;
+- "filters/kword/starwriter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/starwriter/Makefile" ;;
+- "filters/kword/wml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wml/Makefile" ;;
+- "filters/kword/wordperfect/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/Makefile" ;;
+- "filters/kword/wordperfect/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/export/Makefile" ;;
+- "filters/kword/wordperfect/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/import/Makefile" ;;
+- "filters/libdialogfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/libdialogfilter/Makefile" ;;
+- "filters/liboofilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/liboofilter/Makefile" ;;
+- "filters/xsltfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/Makefile" ;;
+- "filters/xsltfilter/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/Makefile" ;;
+- "filters/xsltfilter/export/xsl/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/Makefile" ;;
+- "filters/xsltfilter/export/xsl/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/Makefile" ;;
+- "filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ;;
+- "filters/xsltfilter/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/import/Makefile" ;;
+- "interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
+- "karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/Makefile" ;;
+- "karbon/commands/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/commands/Makefile" ;;
+- "karbon/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/core/Makefile" ;;
+- "karbon/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/data/Makefile" ;;
+- "karbon/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/dialogs/Makefile" ;;
+- "karbon/dockers/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/dockers/Makefile" ;;
+- "karbon/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/pics/Makefile" ;;
+- "karbon/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/Makefile" ;;
+- "karbon/plugins/flattenpath/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/flattenpath/Makefile" ;;
+- "karbon/plugins/imagetool/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/imagetool/Makefile" ;;
+- "karbon/plugins/insertknots/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/insertknots/Makefile" ;;
+- "karbon/plugins/roundcorners/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/roundcorners/Makefile" ;;
+- "karbon/plugins/shadoweffect/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/shadoweffect/Makefile" ;;
+- "karbon/plugins/whirlpinch/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/whirlpinch/Makefile" ;;
+- "karbon/plugins/zoomtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/zoomtool/Makefile" ;;
+- "karbon/render/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/render/Makefile" ;;
+- "karbon/render/xrgbrender/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/render/xrgbrender/Makefile" ;;
+- "karbon/shapes/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/shapes/Makefile" ;;
+- "karbon/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/templates/Makefile" ;;
+- "karbon/templates/basic/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/templates/basic/Makefile" ;;
+- "karbon/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/tools/Makefile" ;;
+- "karbon/visitors/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/visitors/Makefile" ;;
+- "karbon/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/widgets/Makefile" ;;
+- "kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/Makefile" ;;
+- "kchart/kdchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/kdchart/Makefile" ;;
+- "kchart/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/pics/Makefile" ;;
+- "kchart/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/templates/Makefile" ;;
+- "kchart/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/Makefile" ;;
+- "kchart/toolbar/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/crystalsvg/Makefile" ;;
+- "kchart/toolbar/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/locolor/Makefile" ;;
+- "kdgantt/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdgantt/Makefile" ;;
+- "kexi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/Makefile" ;;
+- "kexi/3rdparty/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/Makefile" ;;
+- "kexi/3rdparty/kexisql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/Makefile" ;;
+- "kexi/3rdparty/kexisql/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/src/Makefile" ;;
+- "kexi/3rdparty/kexisql/tool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/tool/Makefile" ;;
+- "kexi/3rdparty/kexisql3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/Makefile" ;;
+- "kexi/3rdparty/kexisql3/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/src/Makefile" ;;
+- "kexi/3rdparty/kolibs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kolibs/Makefile" ;;
+- "kexi/3rdparty/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/uuid/Makefile" ;;
+- "kexi/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/core/Makefile" ;;
+- "kexi/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/data/Makefile" ;;
+- "kexi/data/kde34compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/data/kde34compat/Makefile" ;;
+- "kexi/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/examples/Makefile" ;;
+- "kexi/formeditor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/Makefile" ;;
+- "kexi/formeditor/factories/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/factories/Makefile" ;;
+- "kexi/formeditor/kdevelop_plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/kdevelop_plugin/Makefile" ;;
+- "kexi/formeditor/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/scripting/Makefile" ;;
+- "kexi/formeditor/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/test/Makefile" ;;
+- "kexi/kexidb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/Makefile" ;;
+- "kexi/kexidb/drivers/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/Makefile" ;;
+- "kexi/kexidb/drivers/mySQL/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/mySQL/Makefile" ;;
+- "kexi/kexidb/drivers/odbc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/odbc/Makefile" ;;
+- "kexi/kexidb/drivers/pqxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/pqxx/Makefile" ;;
+- "kexi/kexidb/drivers/sqlite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite/Makefile" ;;
+- "kexi/kexidb/drivers/sqlite2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite2/Makefile" ;;
+- "kexi/kexidb/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/parser/Makefile" ;;
+- "kexi/kexiutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexiutils/Makefile" ;;
+- "kexi/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/Makefile" ;;
+- "kexi/main/printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/printing/Makefile" ;;
+- "kexi/main/startup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/startup/Makefile" ;;
+- "kexi/migration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/Makefile" ;;
+- "kexi/migration/mysql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/mysql/Makefile" ;;
+- "kexi/migration/pqxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/pqxx/Makefile" ;;
+- "kexi/migration/txt/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/txt/Makefile" ;;
+- "kexi/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/pics/Makefile" ;;
+- "kexi/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/Makefile" ;;
+- "kexi/plugins/forms/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/Makefile" ;;
+- "kexi/plugins/forms/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/widgets/Makefile" ;;
+- "kexi/plugins/importexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/Makefile" ;;
+- "kexi/plugins/importexport/csv/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/csv/Makefile" ;;
+- "kexi/plugins/migration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/migration/Makefile" ;;
+- "kexi/plugins/queries/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/queries/Makefile" ;;
+- "kexi/plugins/relations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/relations/Makefile" ;;
+- "kexi/plugins/reports/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/reports/Makefile" ;;
+- "kexi/plugins/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/Makefile" ;;
+- "kexi/plugins/scripting/kexiapp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiapp/Makefile" ;;
+- "kexi/plugins/scripting/kexidb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexidb/Makefile" ;;
+- "kexi/plugins/scripting/kexiscripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiscripting/Makefile" ;;
+- "kexi/plugins/scripting/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/Makefile" ;;
+- "kexi/plugins/scripting/scripts/copycenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/copycenter/Makefile" ;;
+- "kexi/plugins/scripting/scripts/exportxhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/exportxhtml/Makefile" ;;
+- "kexi/plugins/scripting/scripts/importxhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/importxhtml/Makefile" ;;
+- "kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ;;
+- "kexi/plugins/scripting/scripts/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/Makefile" ;;
+- "kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ;;
+- "kexi/plugins/tables/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/tables/Makefile" ;;
+- "kexi/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/Makefile" ;;
+- "kexi/tests/newapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/newapi/Makefile" ;;
+- "kexi/tests/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/parser/Makefile" ;;
+- "kexi/tests/startup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/startup/Makefile" ;;
+- "kexi/tests/tableview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/tableview/Makefile" ;;
+- "kexi/tests/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/widgets/Makefile" ;;
+- "kexi/widget/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/Makefile" ;;
+- "kexi/widget/relations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/relations/Makefile" ;;
+- "kexi/widget/tableview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/tableview/Makefile" ;;
+- "kexi/widget/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/utils/Makefile" ;;
+- "kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES kformula/Makefile" ;;
+- "kformula/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kformula/pics/Makefile" ;;
+- "kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/Makefile" ;;
+- "kivio/kiviopart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/Makefile" ;;
+- "kivio/kiviopart/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/config/Makefile" ;;
+- "kivio/kiviopart/kiviosdk/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/kiviosdk/Makefile" ;;
+- "kivio/kiviopart/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/pics/Makefile" ;;
+- "kivio/kiviopart/stencils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Assorted/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Assorted/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Circuit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Circuit/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Cisco/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Cisco/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Civil/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Civil/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Contact/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Contact/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Electric/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Electric/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/MSE/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/MSE/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Network/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Network/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/SDL/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/SDL/Makefile" ;;
+- "kivio/kiviopart/stencils/Dia/Sybase/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Sybase/Makefile" ;;
+- "kivio/kiviopart/stencils/Flowcharting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Makefile" ;;
+- "kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ;;
+- "kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ;;
+- "kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ;;
+- "kivio/kiviopart/stencils/Geographic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Makefile" ;;
+- "kivio/kiviopart/stencils/Geographic/Flags/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Flags/Makefile" ;;
+- "kivio/kiviopart/stencils/Geographic/Maps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Maps/Makefile" ;;
+- "kivio/kiviopart/stencils/Hardware/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Makefile" ;;
+- "kivio/kiviopart/stencils/Hardware/Computer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Computer/Makefile" ;;
+- "kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ;;
+- "kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ;;
+- "kivio/kiviopart/stencils/UML/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/Makefile" ;;
+- "kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ;;
+- "kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ;;
+- "kivio/kiviopart/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tiles/Makefile" ;;
+- "kivio/kiviopart/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tools/Makefile" ;;
+- "kivio/kiviopart/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/ui/Makefile" ;;
+- "kivio/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/Makefile" ;;
+- "kivio/plugins/kivioconnectortool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/Makefile" ;;
+- "kivio/plugins/kivioconnectortool/straight_connector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/straight_connector/Makefile" ;;
+- "kivio/plugins/kivioselecttool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/Makefile" ;;
+- "kivio/plugins/kivioselecttool/select_pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/select_pics/Makefile" ;;
+- "kivio/plugins/kiviosmlconnector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/Makefile" ;;
+- "kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ;;
+- "kivio/plugins/kiviotargettool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotargettool/Makefile" ;;
+- "kivio/plugins/kiviotexttool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotexttool/Makefile" ;;
+- "kivio/plugins/kiviozoomtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/Makefile" ;;
+- "kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ;;
+- "kivio/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/templates/Makefile" ;;
+- "kivio/templates/basic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/templates/basic/Makefile" ;;
+- "koshell/Makefile" ) CONFIG_FILES="$CONFIG_FILES koshell/Makefile" ;;
+- "kounavail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kounavail/Makefile" ;;
+- "kplato/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/Makefile" ;;
+- "kplato/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/pics/Makefile" ;;
+- "kplato/reports/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/reports/Makefile" ;;
+- "kplato/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/templates/Makefile" ;;
+- "kplato/templates/Simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/templates/Simple/Makefile" ;;
+- "kplato/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/tests/Makefile" ;;
+- "kplato/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/toolbar/Makefile" ;;
+- "kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/Makefile" ;;
+- "kpresenter/autoformEdit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoformEdit/Makefile" ;;
+- "kpresenter/autoforms/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Makefile" ;;
+- "kpresenter/autoforms/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Arrows/Makefile" ;;
+- "kpresenter/autoforms/Connections/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Connections/Makefile" ;;
+- "kpresenter/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/dtd/Makefile" ;;
+- "kpresenter/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/pics/Makefile" ;;
+- "kpresenter/pics/rotate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/pics/rotate/Makefile" ;;
+- "kpresenter/slideshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/slideshow/Makefile" ;;
+- "kpresenter/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Makefile" ;;
+- "kpresenter/templates/A4/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/A4/Makefile" ;;
+- "kpresenter/templates/Screen/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screen/Makefile" ;;
+- "kpresenter/templates/Screenpresentations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screenpresentations/Makefile" ;;
+- "kpresenter/templates/common_icon/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/common_icon/Makefile" ;;
+- "kpresenter/templates/legal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/legal/Makefile" ;;
+- "kpresenter/templates/letter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/letter/Makefile" ;;
+- "kpresenter/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/toolbar/Makefile" ;;
+- "krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/Makefile" ;;
+- "krita/colorspaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/Makefile" ;;
+- "krita/colorspaces/cmyk_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u16/Makefile" ;;
+- "krita/colorspaces/cmyk_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/Makefile" ;;
+- "krita/colorspaces/cmyk_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/templates/Makefile" ;;
+- "krita/colorspaces/gray_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u16/Makefile" ;;
+- "krita/colorspaces/gray_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/Makefile" ;;
+- "krita/colorspaces/gray_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/templates/Makefile" ;;
+- "krita/colorspaces/gray_u8/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/tests/Makefile" ;;
+- "krita/colorspaces/lms_f32/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/lms_f32/Makefile" ;;
+- "krita/colorspaces/rgb_f16half/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/Makefile" ;;
+- "krita/colorspaces/rgb_f16half/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/tests/Makefile" ;;
+- "krita/colorspaces/rgb_f32/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/Makefile" ;;
+- "krita/colorspaces/rgb_f32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/tests/Makefile" ;;
+- "krita/colorspaces/rgb_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/Makefile" ;;
+- "krita/colorspaces/rgb_u16/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/tests/Makefile" ;;
+- "krita/colorspaces/rgb_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/Makefile" ;;
+- "krita/colorspaces/rgb_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/templates/Makefile" ;;
+- "krita/colorspaces/rgb_u8/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/tests/Makefile" ;;
+- "krita/colorspaces/wet/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wet/Makefile" ;;
+- "krita/colorspaces/wetsticky/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/Makefile" ;;
+- "krita/colorspaces/wetsticky/brushop/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/brushop/Makefile" ;;
+- "krita/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/Makefile" ;;
+- "krita/core/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tests/Makefile" ;;
+- "krita/core/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tiles/Makefile" ;;
+- "krita/core/tiles/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tiles/tests/Makefile" ;;
+- "krita/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/Makefile" ;;
+- "krita/data/brushes/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/brushes/Makefile" ;;
+- "krita/data/gradients/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/gradients/Makefile" ;;
+- "krita/data/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/images/Makefile" ;;
+- "krita/data/palettes/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/palettes/Makefile" ;;
+- "krita/data/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/patterns/Makefile" ;;
+- "krita/data/profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/profiles/Makefile" ;;
+- "krita/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/dtd/Makefile" ;;
+- "krita/kritacolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/Makefile" ;;
+- "krita/kritacolor/colorspaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/colorspaces/Makefile" ;;
+- "krita/kritacolor/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/tests/Makefile" ;;
+- "krita/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/pics/Makefile" ;;
+- "krita/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/Makefile" ;;
+- "krita/plugins/filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/Makefile" ;;
+- "krita/plugins/filters/bumpmap/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/bumpmap/Makefile" ;;
+- "krita/plugins/filters/cimg/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cimg/Makefile" ;;
+- "krita/plugins/filters/colorsfilters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/colorsfilters/Makefile" ;;
+- "krita/plugins/filters/convolutionfilters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/convolutionfilters/Makefile" ;;
+- "krita/plugins/filters/cubismfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cubismfilter/Makefile" ;;
+- "krita/plugins/filters/embossfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/embossfilter/Makefile" ;;
+- "krita/plugins/filters/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/example/Makefile" ;;
+- "krita/plugins/filters/imageenhancement/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/imageenhancement/Makefile" ;;
+- "krita/plugins/filters/oilpaintfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/oilpaintfilter/Makefile" ;;
+- "krita/plugins/filters/pixelizefilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/pixelizefilter/Makefile" ;;
+- "krita/plugins/filters/raindropsfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/raindropsfilter/Makefile" ;;
+- "krita/plugins/filters/roundcorners/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/roundcorners/Makefile" ;;
+- "krita/plugins/filters/smalltilesfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/smalltilesfilter/Makefile" ;;
+- "krita/plugins/filters/sobelfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/sobelfilter/Makefile" ;;
+- "krita/plugins/filters/threadtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/threadtest/Makefile" ;;
+- "krita/plugins/paintops/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/Makefile" ;;
+- "krita/plugins/paintops/defaultpaintops/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/defaultpaintops/Makefile" ;;
+- "krita/plugins/paintops/smearybrush/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/smearybrush/Makefile" ;;
+- "krita/plugins/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/Makefile" ;;
+- "krita/plugins/tools/defaulttools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/defaulttools/Makefile" ;;
+- "krita/plugins/tools/selectiontools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/selectiontools/Makefile" ;;
+- "krita/plugins/tools/tool_crop/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_crop/Makefile" ;;
+- "krita/plugins/tools/tool_filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_filter/Makefile" ;;
+- "krita/plugins/tools/tool_polygon/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polygon/Makefile" ;;
+- "krita/plugins/tools/tool_polyline/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polyline/Makefile" ;;
+- "krita/plugins/tools/tool_selectsimilar/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_selectsimilar/Makefile" ;;
+- "krita/plugins/tools/tool_star/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_star/Makefile" ;;
+- "krita/plugins/tools/tool_transform/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_transform/Makefile" ;;
+- "krita/plugins/viewplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/Makefile" ;;
+- "krita/plugins/viewplugins/colorrange/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorrange/Makefile" ;;
+- "krita/plugins/viewplugins/colorspaceconversion/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorspaceconversion/Makefile" ;;
+- "krita/plugins/viewplugins/dropshadow/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/dropshadow/Makefile" ;;
+- "krita/plugins/viewplugins/filtersgallery/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/filtersgallery/Makefile" ;;
+- "krita/plugins/viewplugins/histogram/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram/Makefile" ;;
+- "krita/plugins/viewplugins/histogram_docker/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram_docker/Makefile" ;;
+- "krita/plugins/viewplugins/history_docker/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/history_docker/Makefile" ;;
+- "krita/plugins/viewplugins/imagesize/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/imagesize/Makefile" ;;
+- "krita/plugins/viewplugins/performancetest/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/performancetest/Makefile" ;;
+- "krita/plugins/viewplugins/rotateimage/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/rotateimage/Makefile" ;;
+- "krita/plugins/viewplugins/screenshot/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/screenshot/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/kritacore/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritacore/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/kritascripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritascripting/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/samples/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/python/Makefile" ;;
+- "krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ;;
+- "krita/plugins/viewplugins/separate_channels/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/separate_channels/Makefile" ;;
+- "krita/plugins/viewplugins/shearimage/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/shearimage/Makefile" ;;
+- "krita/plugins/viewplugins/variations/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/variations/Makefile" ;;
+- "krita/sdk/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/sdk/Makefile" ;;
+- "krita/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/ui/Makefile" ;;
+- "kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/Makefile" ;;
+- "kspread/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/dialogs/Makefile" ;;
+- "kspread/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/dtd/Makefile" ;;
+- "kspread/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/extensions/Makefile" ;;
+- "kspread/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/pics/Makefile" ;;
+- "kspread/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/Makefile" ;;
+- "kspread/plugins/calculator/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/Makefile" ;;
+- "kspread/plugins/calculator/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/pics/Makefile" ;;
+- "kspread/plugins/insertcalendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/insertcalendar/Makefile" ;;
+- "kspread/sheetstyles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/sheetstyles/Makefile" ;;
+- "kspread/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/Makefile" ;;
+- "kspread/templates/Business/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/Business/Makefile" ;;
+- "kspread/templates/General/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/General/Makefile" ;;
+- "kspread/templates/HomeFamily/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/HomeFamily/Makefile" ;;
+- "kspread/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/tests/Makefile" ;;
+- "kspread/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/toolbar/Makefile" ;;
+- "kspread/toolbar/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/toolbar/crystalsvg/Makefile" ;;
+- "kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/Makefile" ;;
+- "kugar/kudesigner/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/Makefile" ;;
+- "kugar/kudesigner/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/pics/Makefile" ;;
+- "kugar/kudesigner/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/Makefile" ;;
+- "kugar/kudesigner/templates/General/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/General/Makefile" ;;
+- "kugar/kudesigner/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/toolbar/Makefile" ;;
+- "kugar/kudesigner_lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner_lib/Makefile" ;;
+- "kugar/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/lib/Makefile" ;;
+- "kugar/part/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/part/Makefile" ;;
+- "kugar/samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/samples/Makefile" ;;
+- "kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/Makefile" ;;
+- "kword/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/data/Makefile" ;;
+- "kword/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/dtd/Makefile" ;;
+- "kword/expression/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/expression/Makefile" ;;
+- "kword/horizontalline/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/horizontalline/Makefile" ;;
+- "kword/mailmerge/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/Makefile" ;;
+- "kword/mailmerge/kabc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kabc/Makefile" ;;
+- "kword/mailmerge/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kspread/Makefile" ;;
+- "kword/mailmerge/sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/sql/Makefile" ;;
+- "kword/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/pics/Makefile" ;;
+- "kword/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Makefile" ;;
+- "kword/templates/CardsAndLabels/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/CardsAndLabels/Makefile" ;;
+- "kword/templates/Envelopes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Envelopes/Makefile" ;;
+- "kword/templates/Wordprocessing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Wordprocessing/Makefile" ;;
+- "kword/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/tests/Makefile" ;;
+- "kword/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/toolbar/Makefile" ;;
+- "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+- "lib/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/Makefile" ;;
+- "lib/kformula/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/config/Makefile" ;;
+- "lib/kformula/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/dtd/Makefile" ;;
+- "lib/kformula/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/fonts/Makefile" ;;
+- "lib/kformula/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/Makefile" ;;
+- "lib/kformula/pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/crystalsvg/Makefile" ;;
+- "lib/kofficecore/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficecore/Makefile" ;;
+- "lib/kofficecore/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficecore/tests/Makefile" ;;
+- "lib/kofficeui/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/Makefile" ;;
+- "lib/kofficeui/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/pics/Makefile" ;;
+- "lib/kofficeui/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/tests/Makefile" ;;
+- "lib/kopainter/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kopainter/Makefile" ;;
+- "lib/kopalette/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kopalette/Makefile" ;;
+- "lib/koproperty/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/Makefile" ;;
+- "lib/koproperty/editors/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/editors/Makefile" ;;
+- "lib/koproperty/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/test/Makefile" ;;
+- "lib/kotext/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/Makefile" ;;
+- "lib/kotext/kohyphen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/Makefile" ;;
+- "lib/kotext/kohyphen/hyphdicts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/hyphdicts/Makefile" ;;
+- "lib/kotext/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/tests/Makefile" ;;
+- "lib/kross/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/Makefile" ;;
+- "lib/kross/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/api/Makefile" ;;
+- "lib/kross/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/main/Makefile" ;;
+- "lib/kross/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/Makefile" ;;
+- "lib/kross/python/CXX/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/CXX/Makefile" ;;
+- "lib/kross/python/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/Makefile" ;;
+- "lib/kross/python/scripts/RestrictedPython/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/RestrictedPython/Makefile" ;;
+- "lib/kross/ruby/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/ruby/Makefile" ;;
+- "lib/kross/runner/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/runner/Makefile" ;;
+- "lib/kross/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/test/Makefile" ;;
+- "lib/kwmf/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kwmf/Makefile" ;;
+- "lib/store/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/store/Makefile" ;;
+- "lib/store/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/store/tests/Makefile" ;;
+- "mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/Makefile" ;;
+- "mimetypes/kde33/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/kde33/Makefile" ;;
+- "mimetypes/kde351/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/kde351/Makefile" ;;
+- "pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
+- "pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
+- "plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
+- "plugins/scan/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/scan/Makefile" ;;
+- "servicetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES servicetypes/Makefile" ;;
+- "templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;;
+- "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+- "tools/converter/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/converter/Makefile" ;;
+- "tools/kfile-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/Makefile" ;;
+- "tools/kfile-plugins/abiword/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/abiword/Makefile" ;;
+- "tools/kfile-plugins/gnumeric/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/gnumeric/Makefile" ;;
+- "tools/kfile-plugins/koffice/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/koffice/Makefile" ;;
+- "tools/kfile-plugins/ooo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/ooo/Makefile" ;;
+- "tools/kthesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kthesaurus/Makefile" ;;
+- "tools/quickprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/quickprint/Makefile" ;;
+- "tools/spell/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/spell/Makefile" ;;
+- "tools/thesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/thesaurus/Makefile" ;;
+- "tools/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/thumbnail/Makefile" ;;
+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++ case $ac_config_target in
++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++ "autocorrect/Makefile") CONFIG_FILES="$CONFIG_FILES autocorrect/Makefile" ;;
++ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++ "doc/karbon/Makefile") CONFIG_FILES="$CONFIG_FILES doc/karbon/Makefile" ;;
++ "doc/kchart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kchart/Makefile" ;;
++ "doc/kexi/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kexi/Makefile" ;;
++ "doc/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kformula/Makefile" ;;
++ "doc/kivio/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kivio/Makefile" ;;
++ "doc/koffice/Makefile") CONFIG_FILES="$CONFIG_FILES doc/koffice/Makefile" ;;
++ "doc/koshell/Makefile") CONFIG_FILES="$CONFIG_FILES doc/koshell/Makefile" ;;
++ "doc/kplato/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kplato/Makefile" ;;
++ "doc/kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpresenter/Makefile" ;;
++ "doc/krita/Makefile") CONFIG_FILES="$CONFIG_FILES doc/krita/Makefile" ;;
++ "doc/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kspread/Makefile" ;;
++ "doc/kugar/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kugar/Makefile" ;;
++ "doc/kword/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kword/Makefile" ;;
++ "doc/thesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES doc/thesaurus/Makefile" ;;
++ "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
++ "filters/Makefile") CONFIG_FILES="$CONFIG_FILES filters/Makefile" ;;
++ "filters/generic_wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES filters/generic_wrapper/Makefile" ;;
++ "filters/karbon/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/Makefile" ;;
++ "filters/karbon/ai/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/ai/Makefile" ;;
++ "filters/karbon/applixgraphics/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/applixgraphics/Makefile" ;;
++ "filters/karbon/eps/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/eps/Makefile" ;;
++ "filters/karbon/kontour/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/kontour/Makefile" ;;
++ "filters/karbon/msod/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/msod/Makefile" ;;
++ "filters/karbon/oodraw/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/oodraw/Makefile" ;;
++ "filters/karbon/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/png/Makefile" ;;
++ "filters/karbon/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/svg/Makefile" ;;
++ "filters/karbon/wmf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/wmf/Makefile" ;;
++ "filters/karbon/xaml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/xaml/Makefile" ;;
++ "filters/karbon/xcf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/xcf/Makefile" ;;
++ "filters/kchart/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/Makefile" ;;
++ "filters/kchart/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/bmp/Makefile" ;;
++ "filters/kchart/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/jpeg/Makefile" ;;
++ "filters/kchart/libimageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/libimageexport/Makefile" ;;
++ "filters/kchart/mng/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/mng/Makefile" ;;
++ "filters/kchart/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/png/Makefile" ;;
++ "filters/kchart/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/svg/Makefile" ;;
++ "filters/kchart/xbm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/xbm/Makefile" ;;
++ "filters/kchart/xpm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/xpm/Makefile" ;;
++ "filters/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/Makefile" ;;
++ "filters/kformula/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/latex/Makefile" ;;
++ "filters/kformula/mathml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/mathml/Makefile" ;;
++ "filters/kformula/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/png/Makefile" ;;
++ "filters/kformula/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/svg/Makefile" ;;
++ "filters/kivio/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kivio/Makefile" ;;
++ "filters/kivio/imageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kivio/imageexport/Makefile" ;;
++ "filters/kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/Makefile" ;;
++ "filters/kpresenter/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/bmp/Makefile" ;;
++ "filters/kpresenter/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/jpeg/Makefile" ;;
++ "filters/kpresenter/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/kword/Makefile" ;;
++ "filters/kpresenter/libimageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/libimageexport/Makefile" ;;
++ "filters/kpresenter/magicpoint/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/magicpoint/Makefile" ;;
++ "filters/kpresenter/mng/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/mng/Makefile" ;;
++ "filters/kpresenter/ooimpress/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/ooimpress/Makefile" ;;
++ "filters/kpresenter/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/png/Makefile" ;;
++ "filters/kpresenter/powerpoint/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/Makefile" ;;
++ "filters/kpresenter/powerpoint/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/import/Makefile" ;;
++ "filters/kpresenter/powerpoint/libppt/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/libppt/Makefile" ;;
++ "filters/kpresenter/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/svg/Makefile" ;;
++ "filters/kpresenter/xbm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xbm/Makefile" ;;
++ "filters/kpresenter/xpm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xpm/Makefile" ;;
++ "filters/krita/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/Makefile" ;;
++ "filters/krita/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/jpeg/Makefile" ;;
++ "filters/krita/libkisexif/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/libkisexif/Makefile" ;;
++ "filters/krita/magick/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/magick/Makefile" ;;
++ "filters/krita/openexr/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/openexr/Makefile" ;;
++ "filters/krita/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/png/Makefile" ;;
++ "filters/krita/raw/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/raw/Makefile" ;;
++ "filters/krita/tiff/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/tiff/Makefile" ;;
++ "filters/krita/xcf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/xcf/Makefile" ;;
++ "filters/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/Makefile" ;;
++ "filters/kspread/applixspread/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/applixspread/Makefile" ;;
++ "filters/kspread/csv/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/csv/Makefile" ;;
++ "filters/kspread/dbase/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/dbase/Makefile" ;;
++ "filters/kspread/excel/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/Makefile" ;;
++ "filters/kspread/excel/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/import/Makefile" ;;
++ "filters/kspread/excel/sidewinder/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/sidewinder/Makefile" ;;
++ "filters/kspread/gnumeric/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/gnumeric/Makefile" ;;
++ "filters/kspread/html/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/html/Makefile" ;;
++ "filters/kspread/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/Makefile" ;;
++ "filters/kspread/latex/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/export/Makefile" ;;
++ "filters/kspread/libkspreadexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/libkspreadexport/Makefile" ;;
++ "filters/kspread/opencalc/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/opencalc/Makefile" ;;
++ "filters/kspread/qpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/Makefile" ;;
++ "filters/kspread/qpro/libqpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/Makefile" ;;
++ "filters/kspread/qpro/libqpro/qpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/qpro/Makefile" ;;
++ "filters/kspread/qpro/libqpro/src/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/src/Makefile" ;;
++ "filters/kugar/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kugar/Makefile" ;;
++ "filters/kugar/kugarnop/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kugar/kugarnop/Makefile" ;;
++ "filters/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/Makefile" ;;
++ "filters/kword/abiword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/abiword/Makefile" ;;
++ "filters/kword/amipro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/amipro/Makefile" ;;
++ "filters/kword/applixword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/applixword/Makefile" ;;
++ "filters/kword/ascii/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/ascii/Makefile" ;;
++ "filters/kword/docbook/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/docbook/Makefile" ;;
++ "filters/kword/hancomword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/hancomword/Makefile" ;;
++ "filters/kword/html/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/Makefile" ;;
++ "filters/kword/html/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/export/Makefile" ;;
++ "filters/kword/html/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/import/Makefile" ;;
++ "filters/kword/kword1.3/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/Makefile" ;;
++ "filters/kword/kword1.3/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/import/Makefile" ;;
++ "filters/kword/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/Makefile" ;;
++ "filters/kword/latex/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/export/Makefile" ;;
++ "filters/kword/latex/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/Makefile" ;;
++ "filters/kword/latex/import/generator/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/generator/Makefile" ;;
++ "filters/kword/latex/import/parser/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/parser/Makefile" ;;
++ "filters/kword/libexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/libexport/Makefile" ;;
++ "filters/kword/msword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/msword/Makefile" ;;
++ "filters/kword/mswrite/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/mswrite/Makefile" ;;
++ "filters/kword/oowriter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/oowriter/Makefile" ;;
++ "filters/kword/palmdoc/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/palmdoc/Makefile" ;;
++ "filters/kword/pdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/Makefile" ;;
++ "filters/kword/pdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/Makefile" ;;
++ "filters/kword/pdf/xpdf/goo/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/goo/Makefile" ;;
++ "filters/kword/pdf/xpdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/xpdf/Makefile" ;;
++ "filters/kword/rtf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/Makefile" ;;
++ "filters/kword/rtf/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/export/Makefile" ;;
++ "filters/kword/rtf/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/import/Makefile" ;;
++ "filters/kword/starwriter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/starwriter/Makefile" ;;
++ "filters/kword/wml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wml/Makefile" ;;
++ "filters/kword/wordperfect/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/Makefile" ;;
++ "filters/kword/wordperfect/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/export/Makefile" ;;
++ "filters/kword/wordperfect/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/import/Makefile" ;;
++ "filters/libdialogfilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/libdialogfilter/Makefile" ;;
++ "filters/liboofilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/liboofilter/Makefile" ;;
++ "filters/xsltfilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/Makefile" ;;
++ "filters/xsltfilter/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/Makefile" ;;
++ "filters/xsltfilter/export/xsl/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/Makefile" ;;
++ "filters/xsltfilter/export/xsl/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/Makefile" ;;
++ "filters/xsltfilter/export/xsl/kword/xslfo/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ;;
++ "filters/xsltfilter/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/import/Makefile" ;;
++ "interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
++ "karbon/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/Makefile" ;;
++ "karbon/commands/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/commands/Makefile" ;;
++ "karbon/core/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/core/Makefile" ;;
++ "karbon/data/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/data/Makefile" ;;
++ "karbon/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/dialogs/Makefile" ;;
++ "karbon/dockers/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/dockers/Makefile" ;;
++ "karbon/pics/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/pics/Makefile" ;;
++ "karbon/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/Makefile" ;;
++ "karbon/plugins/flattenpath/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/flattenpath/Makefile" ;;
++ "karbon/plugins/imagetool/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/imagetool/Makefile" ;;
++ "karbon/plugins/insertknots/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/insertknots/Makefile" ;;
++ "karbon/plugins/roundcorners/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/roundcorners/Makefile" ;;
++ "karbon/plugins/shadoweffect/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/shadoweffect/Makefile" ;;
++ "karbon/plugins/whirlpinch/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/whirlpinch/Makefile" ;;
++ "karbon/plugins/zoomtool/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/zoomtool/Makefile" ;;
++ "karbon/render/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/render/Makefile" ;;
++ "karbon/render/xrgbrender/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/render/xrgbrender/Makefile" ;;
++ "karbon/shapes/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/shapes/Makefile" ;;
++ "karbon/templates/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/templates/Makefile" ;;
++ "karbon/templates/basic/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/templates/basic/Makefile" ;;
++ "karbon/tools/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/tools/Makefile" ;;
++ "karbon/visitors/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/visitors/Makefile" ;;
++ "karbon/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/widgets/Makefile" ;;
++ "kchart/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/Makefile" ;;
++ "kchart/kdchart/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/kdchart/Makefile" ;;
++ "kchart/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/pics/Makefile" ;;
++ "kchart/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/templates/Makefile" ;;
++ "kchart/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/Makefile" ;;
++ "kchart/toolbar/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/crystalsvg/Makefile" ;;
++ "kchart/toolbar/locolor/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/locolor/Makefile" ;;
++ "kdgantt/Makefile") CONFIG_FILES="$CONFIG_FILES kdgantt/Makefile" ;;
++ "kexi/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/Makefile" ;;
++ "kexi/3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/Makefile" ;;
++ "kexi/3rdparty/kexisql/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/Makefile" ;;
++ "kexi/3rdparty/kexisql/src/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/src/Makefile" ;;
++ "kexi/3rdparty/kexisql/tool/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/tool/Makefile" ;;
++ "kexi/3rdparty/kexisql3/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/Makefile" ;;
++ "kexi/3rdparty/kexisql3/src/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/src/Makefile" ;;
++ "kexi/3rdparty/kolibs/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kolibs/Makefile" ;;
++ "kexi/3rdparty/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/uuid/Makefile" ;;
++ "kexi/core/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/core/Makefile" ;;
++ "kexi/data/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/data/Makefile" ;;
++ "kexi/data/kde34compat/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/data/kde34compat/Makefile" ;;
++ "kexi/examples/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/examples/Makefile" ;;
++ "kexi/formeditor/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/Makefile" ;;
++ "kexi/formeditor/factories/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/factories/Makefile" ;;
++ "kexi/formeditor/kdevelop_plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/kdevelop_plugin/Makefile" ;;
++ "kexi/formeditor/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/scripting/Makefile" ;;
++ "kexi/formeditor/test/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/test/Makefile" ;;
++ "kexi/kexidb/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/Makefile" ;;
++ "kexi/kexidb/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/Makefile" ;;
++ "kexi/kexidb/drivers/mySQL/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/mySQL/Makefile" ;;
++ "kexi/kexidb/drivers/odbc/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/odbc/Makefile" ;;
++ "kexi/kexidb/drivers/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/pqxx/Makefile" ;;
++ "kexi/kexidb/drivers/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite/Makefile" ;;
++ "kexi/kexidb/drivers/sqlite2/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite2/Makefile" ;;
++ "kexi/kexidb/parser/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/parser/Makefile" ;;
++ "kexi/kexiutils/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexiutils/Makefile" ;;
++ "kexi/main/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/Makefile" ;;
++ "kexi/main/printing/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/printing/Makefile" ;;
++ "kexi/main/startup/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/startup/Makefile" ;;
++ "kexi/migration/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/Makefile" ;;
++ "kexi/migration/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/mysql/Makefile" ;;
++ "kexi/migration/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/pqxx/Makefile" ;;
++ "kexi/migration/txt/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/txt/Makefile" ;;
++ "kexi/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/pics/Makefile" ;;
++ "kexi/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/Makefile" ;;
++ "kexi/plugins/forms/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/Makefile" ;;
++ "kexi/plugins/forms/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/widgets/Makefile" ;;
++ "kexi/plugins/importexport/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/Makefile" ;;
++ "kexi/plugins/importexport/csv/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/csv/Makefile" ;;
++ "kexi/plugins/migration/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/migration/Makefile" ;;
++ "kexi/plugins/queries/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/queries/Makefile" ;;
++ "kexi/plugins/relations/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/relations/Makefile" ;;
++ "kexi/plugins/reports/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/reports/Makefile" ;;
++ "kexi/plugins/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/Makefile" ;;
++ "kexi/plugins/scripting/kexiapp/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiapp/Makefile" ;;
++ "kexi/plugins/scripting/kexidb/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexidb/Makefile" ;;
++ "kexi/plugins/scripting/kexiscripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiscripting/Makefile" ;;
++ "kexi/plugins/scripting/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/Makefile" ;;
++ "kexi/plugins/scripting/scripts/copycenter/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/copycenter/Makefile" ;;
++ "kexi/plugins/scripting/scripts/exportxhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/exportxhtml/Makefile" ;;
++ "kexi/plugins/scripting/scripts/importxhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/importxhtml/Makefile" ;;
++ "kexi/plugins/scripting/scripts/projectdocumentor/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ;;
++ "kexi/plugins/scripting/scripts/python/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/Makefile" ;;
++ "kexi/plugins/scripting/scripts/python/kexiapp/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ;;
++ "kexi/plugins/tables/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/tables/Makefile" ;;
++ "kexi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/Makefile" ;;
++ "kexi/tests/newapi/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/newapi/Makefile" ;;
++ "kexi/tests/parser/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/parser/Makefile" ;;
++ "kexi/tests/startup/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/startup/Makefile" ;;
++ "kexi/tests/tableview/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/tableview/Makefile" ;;
++ "kexi/tests/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/widgets/Makefile" ;;
++ "kexi/widget/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/Makefile" ;;
++ "kexi/widget/relations/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/relations/Makefile" ;;
++ "kexi/widget/tableview/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/tableview/Makefile" ;;
++ "kexi/widget/utils/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/utils/Makefile" ;;
++ "kformula/Makefile") CONFIG_FILES="$CONFIG_FILES kformula/Makefile" ;;
++ "kformula/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kformula/pics/Makefile" ;;
++ "kivio/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/Makefile" ;;
++ "kivio/kiviopart/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/Makefile" ;;
++ "kivio/kiviopart/config/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/config/Makefile" ;;
++ "kivio/kiviopart/kiviosdk/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/kiviosdk/Makefile" ;;
++ "kivio/kiviopart/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/pics/Makefile" ;;
++ "kivio/kiviopart/stencils/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Assorted/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Assorted/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Circuit/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Circuit/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Cisco/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Cisco/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Civil/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Civil/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Contact/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Contact/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Electric/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Electric/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Jigsaw/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/MSE/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/MSE/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Network/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Network/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Pneumatic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/SDL/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/SDL/Makefile" ;;
++ "kivio/kiviopart/stencils/Dia/Sybase/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Sybase/Makefile" ;;
++ "kivio/kiviopart/stencils/Flowcharting/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Makefile" ;;
++ "kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ;;
++ "kivio/kiviopart/stencils/Flowcharting/Extended/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ;;
++ "kivio/kiviopart/stencils/Flowcharting/Logic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ;;
++ "kivio/kiviopart/stencils/Geographic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Makefile" ;;
++ "kivio/kiviopart/stencils/Geographic/Flags/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Flags/Makefile" ;;
++ "kivio/kiviopart/stencils/Geographic/Maps/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Maps/Makefile" ;;
++ "kivio/kiviopart/stencils/Hardware/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Makefile" ;;
++ "kivio/kiviopart/stencils/Hardware/Computer/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Computer/Makefile" ;;
++ "kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/ER/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/People/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ;;
++ "kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ;;
++ "kivio/kiviopart/stencils/UML/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/Makefile" ;;
++ "kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ;;
++ "kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ;;
++ "kivio/kiviopart/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tiles/Makefile" ;;
++ "kivio/kiviopart/tools/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tools/Makefile" ;;
++ "kivio/kiviopart/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/ui/Makefile" ;;
++ "kivio/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/Makefile" ;;
++ "kivio/plugins/kivioconnectortool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/Makefile" ;;
++ "kivio/plugins/kivioconnectortool/straight_connector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/straight_connector/Makefile" ;;
++ "kivio/plugins/kivioselecttool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/Makefile" ;;
++ "kivio/plugins/kivioselecttool/select_pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/select_pics/Makefile" ;;
++ "kivio/plugins/kiviosmlconnector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/Makefile" ;;
++ "kivio/plugins/kiviosmlconnector/sml_connector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ;;
++ "kivio/plugins/kiviotargettool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotargettool/Makefile" ;;
++ "kivio/plugins/kiviotexttool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotexttool/Makefile" ;;
++ "kivio/plugins/kiviozoomtool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/Makefile" ;;
++ "kivio/plugins/kiviozoomtool/zoom_pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ;;
++ "kivio/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/templates/Makefile" ;;
++ "kivio/templates/basic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/templates/basic/Makefile" ;;
++ "koshell/Makefile") CONFIG_FILES="$CONFIG_FILES koshell/Makefile" ;;
++ "kounavail/Makefile") CONFIG_FILES="$CONFIG_FILES kounavail/Makefile" ;;
++ "kplato/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/Makefile" ;;
++ "kplato/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/pics/Makefile" ;;
++ "kplato/reports/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/reports/Makefile" ;;
++ "kplato/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/templates/Makefile" ;;
++ "kplato/templates/Simple/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/templates/Simple/Makefile" ;;
++ "kplato/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/tests/Makefile" ;;
++ "kplato/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/toolbar/Makefile" ;;
++ "kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/Makefile" ;;
++ "kpresenter/autoformEdit/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoformEdit/Makefile" ;;
++ "kpresenter/autoforms/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Makefile" ;;
++ "kpresenter/autoforms/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Arrows/Makefile" ;;
++ "kpresenter/autoforms/Connections/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Connections/Makefile" ;;
++ "kpresenter/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/dtd/Makefile" ;;
++ "kpresenter/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/pics/Makefile" ;;
++ "kpresenter/pics/rotate/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/pics/rotate/Makefile" ;;
++ "kpresenter/slideshow/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/slideshow/Makefile" ;;
++ "kpresenter/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Makefile" ;;
++ "kpresenter/templates/A4/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/A4/Makefile" ;;
++ "kpresenter/templates/Screen/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screen/Makefile" ;;
++ "kpresenter/templates/Screenpresentations/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screenpresentations/Makefile" ;;
++ "kpresenter/templates/common_icon/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/common_icon/Makefile" ;;
++ "kpresenter/templates/legal/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/legal/Makefile" ;;
++ "kpresenter/templates/letter/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/letter/Makefile" ;;
++ "kpresenter/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/toolbar/Makefile" ;;
++ "krita/Makefile") CONFIG_FILES="$CONFIG_FILES krita/Makefile" ;;
++ "krita/colorspaces/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/Makefile" ;;
++ "krita/colorspaces/cmyk_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u16/Makefile" ;;
++ "krita/colorspaces/cmyk_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/Makefile" ;;
++ "krita/colorspaces/cmyk_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/templates/Makefile" ;;
++ "krita/colorspaces/gray_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u16/Makefile" ;;
++ "krita/colorspaces/gray_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/Makefile" ;;
++ "krita/colorspaces/gray_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/templates/Makefile" ;;
++ "krita/colorspaces/gray_u8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/tests/Makefile" ;;
++ "krita/colorspaces/lms_f32/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/lms_f32/Makefile" ;;
++ "krita/colorspaces/rgb_f16half/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/Makefile" ;;
++ "krita/colorspaces/rgb_f16half/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/tests/Makefile" ;;
++ "krita/colorspaces/rgb_f32/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/Makefile" ;;
++ "krita/colorspaces/rgb_f32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/tests/Makefile" ;;
++ "krita/colorspaces/rgb_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/Makefile" ;;
++ "krita/colorspaces/rgb_u16/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/tests/Makefile" ;;
++ "krita/colorspaces/rgb_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/Makefile" ;;
++ "krita/colorspaces/rgb_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/templates/Makefile" ;;
++ "krita/colorspaces/rgb_u8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/tests/Makefile" ;;
++ "krita/colorspaces/wet/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wet/Makefile" ;;
++ "krita/colorspaces/wetsticky/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/Makefile" ;;
++ "krita/colorspaces/wetsticky/brushop/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/brushop/Makefile" ;;
++ "krita/core/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/Makefile" ;;
++ "krita/core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tests/Makefile" ;;
++ "krita/core/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tiles/Makefile" ;;
++ "krita/core/tiles/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tiles/tests/Makefile" ;;
++ "krita/data/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/Makefile" ;;
++ "krita/data/brushes/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/brushes/Makefile" ;;
++ "krita/data/gradients/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/gradients/Makefile" ;;
++ "krita/data/images/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/images/Makefile" ;;
++ "krita/data/palettes/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/palettes/Makefile" ;;
++ "krita/data/patterns/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/patterns/Makefile" ;;
++ "krita/data/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/profiles/Makefile" ;;
++ "krita/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES krita/dtd/Makefile" ;;
++ "krita/kritacolor/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/Makefile" ;;
++ "krita/kritacolor/colorspaces/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/colorspaces/Makefile" ;;
++ "krita/kritacolor/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/tests/Makefile" ;;
++ "krita/pics/Makefile") CONFIG_FILES="$CONFIG_FILES krita/pics/Makefile" ;;
++ "krita/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/Makefile" ;;
++ "krita/plugins/filters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/Makefile" ;;
++ "krita/plugins/filters/bumpmap/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/bumpmap/Makefile" ;;
++ "krita/plugins/filters/cimg/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cimg/Makefile" ;;
++ "krita/plugins/filters/colorsfilters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/colorsfilters/Makefile" ;;
++ "krita/plugins/filters/convolutionfilters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/convolutionfilters/Makefile" ;;
++ "krita/plugins/filters/cubismfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cubismfilter/Makefile" ;;
++ "krita/plugins/filters/embossfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/embossfilter/Makefile" ;;
++ "krita/plugins/filters/example/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/example/Makefile" ;;
++ "krita/plugins/filters/imageenhancement/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/imageenhancement/Makefile" ;;
++ "krita/plugins/filters/oilpaintfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/oilpaintfilter/Makefile" ;;
++ "krita/plugins/filters/pixelizefilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/pixelizefilter/Makefile" ;;
++ "krita/plugins/filters/raindropsfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/raindropsfilter/Makefile" ;;
++ "krita/plugins/filters/roundcorners/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/roundcorners/Makefile" ;;
++ "krita/plugins/filters/smalltilesfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/smalltilesfilter/Makefile" ;;
++ "krita/plugins/filters/sobelfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/sobelfilter/Makefile" ;;
++ "krita/plugins/filters/threadtest/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/threadtest/Makefile" ;;
++ "krita/plugins/paintops/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/Makefile" ;;
++ "krita/plugins/paintops/defaultpaintops/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/defaultpaintops/Makefile" ;;
++ "krita/plugins/paintops/smearybrush/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/smearybrush/Makefile" ;;
++ "krita/plugins/tools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/Makefile" ;;
++ "krita/plugins/tools/defaulttools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/defaulttools/Makefile" ;;
++ "krita/plugins/tools/selectiontools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/selectiontools/Makefile" ;;
++ "krita/plugins/tools/tool_crop/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_crop/Makefile" ;;
++ "krita/plugins/tools/tool_filter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_filter/Makefile" ;;
++ "krita/plugins/tools/tool_polygon/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polygon/Makefile" ;;
++ "krita/plugins/tools/tool_polyline/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polyline/Makefile" ;;
++ "krita/plugins/tools/tool_selectsimilar/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_selectsimilar/Makefile" ;;
++ "krita/plugins/tools/tool_star/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_star/Makefile" ;;
++ "krita/plugins/tools/tool_transform/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_transform/Makefile" ;;
++ "krita/plugins/viewplugins/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/Makefile" ;;
++ "krita/plugins/viewplugins/colorrange/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorrange/Makefile" ;;
++ "krita/plugins/viewplugins/colorspaceconversion/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorspaceconversion/Makefile" ;;
++ "krita/plugins/viewplugins/dropshadow/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/dropshadow/Makefile" ;;
++ "krita/plugins/viewplugins/filtersgallery/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/filtersgallery/Makefile" ;;
++ "krita/plugins/viewplugins/histogram/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram/Makefile" ;;
++ "krita/plugins/viewplugins/histogram_docker/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram_docker/Makefile" ;;
++ "krita/plugins/viewplugins/history_docker/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/history_docker/Makefile" ;;
++ "krita/plugins/viewplugins/imagesize/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/imagesize/Makefile" ;;
++ "krita/plugins/viewplugins/performancetest/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/performancetest/Makefile" ;;
++ "krita/plugins/viewplugins/rotateimage/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/rotateimage/Makefile" ;;
++ "krita/plugins/viewplugins/screenshot/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/screenshot/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/kritacore/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritacore/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/kritascripting/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritascripting/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/samples/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/samples/python/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/python/Makefile" ;;
++ "krita/plugins/viewplugins/scripting/samples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ;;
++ "krita/plugins/viewplugins/separate_channels/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/separate_channels/Makefile" ;;
++ "krita/plugins/viewplugins/shearimage/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/shearimage/Makefile" ;;
++ "krita/plugins/viewplugins/variations/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/variations/Makefile" ;;
++ "krita/sdk/Makefile") CONFIG_FILES="$CONFIG_FILES krita/sdk/Makefile" ;;
++ "krita/ui/Makefile") CONFIG_FILES="$CONFIG_FILES krita/ui/Makefile" ;;
++ "kspread/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/Makefile" ;;
++ "kspread/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/dialogs/Makefile" ;;
++ "kspread/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/dtd/Makefile" ;;
++ "kspread/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/extensions/Makefile" ;;
++ "kspread/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/pics/Makefile" ;;
++ "kspread/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/Makefile" ;;
++ "kspread/plugins/calculator/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/Makefile" ;;
++ "kspread/plugins/calculator/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/pics/Makefile" ;;
++ "kspread/plugins/insertcalendar/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/insertcalendar/Makefile" ;;
++ "kspread/sheetstyles/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/sheetstyles/Makefile" ;;
++ "kspread/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/Makefile" ;;
++ "kspread/templates/Business/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/Business/Makefile" ;;
++ "kspread/templates/General/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/General/Makefile" ;;
++ "kspread/templates/HomeFamily/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/HomeFamily/Makefile" ;;
++ "kspread/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/tests/Makefile" ;;
++ "kspread/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/toolbar/Makefile" ;;
++ "kspread/toolbar/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/toolbar/crystalsvg/Makefile" ;;
++ "kugar/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/Makefile" ;;
++ "kugar/kudesigner/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/Makefile" ;;
++ "kugar/kudesigner/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/pics/Makefile" ;;
++ "kugar/kudesigner/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/Makefile" ;;
++ "kugar/kudesigner/templates/General/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/General/Makefile" ;;
++ "kugar/kudesigner/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/toolbar/Makefile" ;;
++ "kugar/kudesigner_lib/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner_lib/Makefile" ;;
++ "kugar/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/lib/Makefile" ;;
++ "kugar/part/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/part/Makefile" ;;
++ "kugar/samples/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/samples/Makefile" ;;
++ "kword/Makefile") CONFIG_FILES="$CONFIG_FILES kword/Makefile" ;;
++ "kword/data/Makefile") CONFIG_FILES="$CONFIG_FILES kword/data/Makefile" ;;
++ "kword/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kword/dtd/Makefile" ;;
++ "kword/expression/Makefile") CONFIG_FILES="$CONFIG_FILES kword/expression/Makefile" ;;
++ "kword/horizontalline/Makefile") CONFIG_FILES="$CONFIG_FILES kword/horizontalline/Makefile" ;;
++ "kword/mailmerge/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/Makefile" ;;
++ "kword/mailmerge/kabc/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kabc/Makefile" ;;
++ "kword/mailmerge/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kspread/Makefile" ;;
++ "kword/mailmerge/sql/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/sql/Makefile" ;;
++ "kword/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kword/pics/Makefile" ;;
++ "kword/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Makefile" ;;
++ "kword/templates/CardsAndLabels/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/CardsAndLabels/Makefile" ;;
++ "kword/templates/Envelopes/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Envelopes/Makefile" ;;
++ "kword/templates/Wordprocessing/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Wordprocessing/Makefile" ;;
++ "kword/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kword/tests/Makefile" ;;
++ "kword/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kword/toolbar/Makefile" ;;
++ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
++ "lib/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/Makefile" ;;
++ "lib/kformula/config/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/config/Makefile" ;;
++ "lib/kformula/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/dtd/Makefile" ;;
++ "lib/kformula/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/fonts/Makefile" ;;
++ "lib/kformula/pics/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/Makefile" ;;
++ "lib/kformula/pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/crystalsvg/Makefile" ;;
++ "lib/kofficecore/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficecore/Makefile" ;;
++ "lib/kofficecore/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficecore/tests/Makefile" ;;
++ "lib/kofficeui/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/Makefile" ;;
++ "lib/kofficeui/pics/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/pics/Makefile" ;;
++ "lib/kofficeui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/tests/Makefile" ;;
++ "lib/kopainter/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kopainter/Makefile" ;;
++ "lib/kopalette/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kopalette/Makefile" ;;
++ "lib/koproperty/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/Makefile" ;;
++ "lib/koproperty/editors/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/editors/Makefile" ;;
++ "lib/koproperty/test/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/test/Makefile" ;;
++ "lib/kotext/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/Makefile" ;;
++ "lib/kotext/kohyphen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/Makefile" ;;
++ "lib/kotext/kohyphen/hyphdicts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/hyphdicts/Makefile" ;;
++ "lib/kotext/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/tests/Makefile" ;;
++ "lib/kross/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/Makefile" ;;
++ "lib/kross/api/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/api/Makefile" ;;
++ "lib/kross/main/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/main/Makefile" ;;
++ "lib/kross/python/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/Makefile" ;;
++ "lib/kross/python/CXX/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/CXX/Makefile" ;;
++ "lib/kross/python/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/Makefile" ;;
++ "lib/kross/python/scripts/RestrictedPython/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/RestrictedPython/Makefile" ;;
++ "lib/kross/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/ruby/Makefile" ;;
++ "lib/kross/runner/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/runner/Makefile" ;;
++ "lib/kross/test/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/test/Makefile" ;;
++ "lib/kwmf/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kwmf/Makefile" ;;
++ "lib/store/Makefile") CONFIG_FILES="$CONFIG_FILES lib/store/Makefile" ;;
++ "lib/store/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/store/tests/Makefile" ;;
++ "mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/Makefile" ;;
++ "mimetypes/kde33/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/kde33/Makefile" ;;
++ "mimetypes/kde351/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/kde351/Makefile" ;;
++ "pics/Makefile") CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
++ "pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
++ "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
++ "plugins/scan/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/scan/Makefile" ;;
++ "servicetypes/Makefile") CONFIG_FILES="$CONFIG_FILES servicetypes/Makefile" ;;
++ "templates/Makefile") CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;;
++ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
++ "tools/converter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/converter/Makefile" ;;
++ "tools/kfile-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/Makefile" ;;
++ "tools/kfile-plugins/abiword/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/abiword/Makefile" ;;
++ "tools/kfile-plugins/gnumeric/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/gnumeric/Makefile" ;;
++ "tools/kfile-plugins/koffice/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/koffice/Makefile" ;;
++ "tools/kfile-plugins/ooo/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/ooo/Makefile" ;;
++ "tools/kthesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kthesaurus/Makefile" ;;
++ "tools/quickprint/Makefile") CONFIG_FILES="$CONFIG_FILES tools/quickprint/Makefile" ;;
++ "tools/spell/Makefile") CONFIG_FILES="$CONFIG_FILES tools/spell/Makefile" ;;
++ "tools/thesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES tools/thesaurus/Makefile" ;;
++ "tools/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES tools/thumbnail/Makefile" ;;
+
-+dnl Assume we're building until something fails, unless explicitly disabled
-+AC_ARG_ENABLE(pgsql,
-+AC_HELP_STRING([--enable-pgsql],[build PostgreSQL-plugin [default=yes]]),
-+ pgsql_plugin=$enableval, pgsql_plugin=yes)
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ done
+
+
-+if test "x$pgsql_plugin" = "xyes"; then
-+ compile_pgsql_plugin="yes"
-+else
-+ compile_pgsql_plugin="no"
-+fi
+ # 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
+@@ -60241,715 +66085,947 @@
+ fi
+
+ # Have a temporary directory for convenience. Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++ tmp=
++ trap 'exit_status=$?
++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+
+ {
+- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+- tmp=./confstat$$-$RANDOM
+- (umask 077 && mkdir $tmp)
++ tmp=./conf$$-$RANDOM
++ (umask 077 && mkdir "$tmp")
+ } ||
+ {
+ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+ }
+
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
++# Set up the sed scripts for CONFIG_FILES section.
+ #
+
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+- # Protect against being on the right side of a sed subst in config.status.
+- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at mkdir_p@,$mkdir_p,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+-s, at KDECONFIG@,$KDECONFIG,;t t
+-s, at kde_libs_prefix@,$kde_libs_prefix,;t t
+-s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at LIBMAGICK_LIBS@,$LIBMAGICK_LIBS,;t t
+-s, at LIBMAGICK_LDFLAGS@,$LIBMAGICK_LDFLAGS,;t t
+-s, at LIBMAGICK_CPPFLAGS@,$LIBMAGICK_CPPFLAGS,;t t
+-s, at LIBMAGICK_RPATH@,$LIBMAGICK_RPATH,;t t
+-s, at include_imagemagick_filter_TRUE@,$include_imagemagick_filter_TRUE,;t t
+-s, at include_imagemagick_filter_FALSE@,$include_imagemagick_filter_FALSE,;t t
+-s, at need_kde32_compatibility_TRUE@,$need_kde32_compatibility_TRUE,;t t
+-s, at need_kde32_compatibility_FALSE@,$need_kde32_compatibility_FALSE,;t t
+-s, at need_kde33_compatibility_TRUE@,$need_kde33_compatibility_TRUE,;t t
+-s, at need_kde33_compatibility_FALSE@,$need_kde33_compatibility_FALSE,;t t
+-s, at need_kde34_compatibility_TRUE@,$need_kde34_compatibility_TRUE,;t t
+-s, at need_kde34_compatibility_FALSE@,$need_kde34_compatibility_FALSE,;t t
+-s, at need_kde351_compatibility_TRUE@,$need_kde351_compatibility_TRUE,;t t
+-s, at need_kde351_compatibility_FALSE@,$need_kde351_compatibility_FALSE,;t t
+-s, at need_kde31_compatibility_TRUE@,$need_kde31_compatibility_TRUE,;t t
+-s, at need_kde31_compatibility_FALSE@,$need_kde31_compatibility_FALSE,;t t
+-s, at OPENEXR_LIBS@,$OPENEXR_LIBS,;t t
+-s, at OPENEXR_CFLAGS@,$OPENEXR_CFLAGS,;t t
+-s, at OPENEXR_RPATH@,$OPENEXR_RPATH,;t t
+-s, at have_openexr_TRUE@,$have_openexr_TRUE,;t t
+-s, at have_openexr_FALSE@,$have_openexr_FALSE,;t t
+-s, at LIBTIFF@,$LIBTIFF,;t t
+-s, at have_tiff_TRUE@,$have_tiff_TRUE,;t t
+-s, at have_tiff_FALSE@,$have_tiff_FALSE,;t t
+-s, at have_png_TRUE@,$have_png_TRUE,;t t
+-s, at have_png_FALSE@,$have_png_FALSE,;t t
+-s, at have_jpeg_TRUE@,$have_jpeg_TRUE,;t t
+-s, at have_jpeg_FALSE@,$have_jpeg_FALSE,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at LIBEXIF_CFLAGS@,$LIBEXIF_CFLAGS,;t t
+-s, at LIBEXIF_LIBS@,$LIBEXIF_LIBS,;t t
+-s, at have_exif_TRUE@,$have_exif_TRUE,;t t
+-s, at have_exif_FALSE@,$have_exif_FALSE,;t t
+-s, at include_jpeg_filter_TRUE@,$include_jpeg_filter_TRUE,;t t
+-s, at include_jpeg_filter_FALSE@,$include_jpeg_filter_FALSE,;t t
+-s, at include_tiff_filter_TRUE@,$include_tiff_filter_TRUE,;t t
+-s, at include_tiff_filter_FALSE@,$include_tiff_filter_FALSE,;t t
+-s, at LIBWV2_LIBS@,$LIBWV2_LIBS,;t t
+-s, at LIBWV2_CFLAGS@,$LIBWV2_CFLAGS,;t t
+-s, at LIBWV2_RPATH@,$LIBWV2_RPATH,;t t
+-s, at include_wv2_msword_filter_TRUE@,$include_wv2_msword_filter_TRUE,;t t
+-s, at include_wv2_msword_filter_FALSE@,$include_wv2_msword_filter_FALSE,;t t
+-s, at LIBPAPER@,$LIBPAPER,;t t
+-s, at LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
+-s, at LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
+-s, at LIBWPD_RPATH@,$LIBWPD_RPATH,;t t
+-s, at include_wpd_filter_TRUE@,$include_wpd_filter_TRUE,;t t
+-s, at include_wpd_filter_FALSE@,$include_wpd_filter_FALSE,;t t
+-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
+-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
+-s, at LIBXSLT_RPATH@,$LIBXSLT_RPATH,;t t
+-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
+-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
+-s, at LIBXML_RPATH@,$LIBXML_RPATH,;t t
+-s, at include_XSLTFILTERS_TRUE@,$include_XSLTFILTERS_TRUE,;t t
+-s, at include_XSLTFILTERS_FALSE@,$include_XSLTFILTERS_FALSE,;t t
+-s, at LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t
+-s, at LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t
+-s, at LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t
+-s, at LIBART_LIBS@,$LIBART_LIBS,;t t
+-s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
+-s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+-s, at LIBFONTCONFIG_LIBS@,$LIBFONTCONFIG_LIBS,;t t
+-s, at LIBFONTCONFIG_CFLAGS@,$LIBFONTCONFIG_CFLAGS,;t t
+-s, at LIBFONTCONFIG_RPATH@,$LIBFONTCONFIG_RPATH,;t t
+-s, at have_readline_TRUE@,$have_readline_TRUE,;t t
+-s, at have_readline_FALSE@,$have_readline_FALSE,;t t
+-s, at LIBREADLINE@,$LIBREADLINE,;t t
+-s, at LIB_KEXI_KMDI@,$LIB_KEXI_KMDI,;t t
+-s, at LIB_KEXI_KMDI_INCLUDES@,$LIB_KEXI_KMDI_INCLUDES,;t t
+-s, at MYSQL_INC@,$MYSQL_INC,;t t
+-s, at MYSQL_LIBS@,$MYSQL_LIBS,;t t
+-s, at compile_mysql_plugin_TRUE@,$compile_mysql_plugin_TRUE,;t t
+-s, at compile_mysql_plugin_FALSE@,$compile_mysql_plugin_FALSE,;t t
+-s, at PG_INCDIR@,$PG_INCDIR,;t t
+-s, at PG_LIBDIR@,$PG_LIBDIR,;t t
+-s, at compile_pgsql_plugin_TRUE@,$compile_pgsql_plugin_TRUE,;t t
+-s, at compile_pgsql_plugin_FALSE@,$compile_pgsql_plugin_FALSE,;t t
+-s, at PQXX_INCDIR@,$PQXX_INCDIR,;t t
+-s, at PQXX_LIBDIR@,$PQXX_LIBDIR,;t t
+-s, at LIB_KFEEDBACK@,$LIB_KFEEDBACK,;t t
+-s, at INC_KFEEDBACK@,$INC_KFEEDBACK,;t t
+-s, at use_kexifeedback_TRUE@,$use_kexifeedback_TRUE,;t t
+-s, at use_kexifeedback_FALSE@,$use_kexifeedback_FALSE,;t t
+-s, at PYTHONINC@,$PYTHONINC,;t t
+-s, at PYTHONLIB@,$PYTHONLIB,;t t
+-s, at LIBPYTHON@,$LIBPYTHON,;t t
+-s, at PYTHONMODDIR@,$PYTHONMODDIR,;t t
+-s, at LIB_XINPUTEXT@,$LIB_XINPUTEXT,;t t
+-s, at LCMS_LIBS@,$LCMS_LIBS,;t t
+-s, at include_kunittest_tests_TRUE@,$include_kunittest_tests_TRUE,;t t
+-s, at include_kunittest_tests_FALSE@,$include_kunittest_tests_FALSE,;t t
+-s, at GLINC@,$GLINC,;t t
+-s, at GLLIB@,$GLLIB,;t t
+-s, at use_kjsembed_TRUE@,$use_kjsembed_TRUE,;t t
+-s, at use_kjsembed_FALSE@,$use_kjsembed_FALSE,;t t
+-s, at SQLDIR@,$SQLDIR,;t t
+-s, at include_sql_TRUE@,$include_sql_TRUE,;t t
+-s, at include_sql_FALSE@,$include_sql_FALSE,;t t
+-s, at KWMF_INCLUDES@,$KWMF_INCLUDES,;t t
+-s, at KSTORE_INCLUDES@,$KSTORE_INCLUDES,;t t
+-s, at KOTEXT_INCLUDES@,$KOTEXT_INCLUDES,;t t
+-s, at KOPAINTER_INCLUDES@,$KOPAINTER_INCLUDES,;t t
+-s, at KOPALETTE_INCLUDES@,$KOPALETTE_INCLUDES,;t t
+-s, at KOFFICECORE_INCLUDES@,$KOFFICECORE_INCLUDES,;t t
+-s, at KOFFICEUI_INCLUDES@,$KOFFICEUI_INCLUDES,;t t
+-s, at KFORMULA_INCLUDES@,$KFORMULA_INCLUDES,;t t
+-s, at KOPROPERTY_INCLUDES@,$KOPROPERTY_INCLUDES,;t t
+-s, at KROSS_INCLUDES@,$KROSS_INCLUDES,;t t
+-s, at LIB_KOFFICEUI@,$LIB_KOFFICEUI,;t t
+-s, at LIB_KOFFICECORE@,$LIB_KOFFICECORE,;t t
+-s, at LIB_KSTORE@,$LIB_KSTORE,;t t
+-s, at LIB_KOTEXT@,$LIB_KOTEXT,;t t
+-s, at LIB_KOPAINTER@,$LIB_KOPAINTER,;t t
+-s, at LIB_KOPALETTE@,$LIB_KOPALETTE,;t t
+-s, at LIB_KWMF@,$LIB_KWMF,;t t
+-s, at LIB_KOWMF@,$LIB_KOWMF,;t t
+-s, at LIB_KFORMULA@,$LIB_KFORMULA,;t t
+-s, at LIB_KOPROPERTY@,$LIB_KOPROPERTY,;t t
+-s, at LIB_KROSS_API@,$LIB_KROSS_API,;t t
+-s, at LIB_KROSS_MAIN@,$LIB_KROSS_MAIN,;t t
+-s, at interfacedir@,$interfacedir,;t t
+-s, at KOFFICE_LIBS@,$KOFFICE_LIBS,;t t
+-s, at KOFFICE_INCLUDES@,$KOFFICE_INCLUDES,;t t
+-s, at LIBKSPELL2@,$LIBKSPELL2,;t t
+-s, at compile_kross_TRUE@,$compile_kross_TRUE,;t t
+-s, at compile_kross_FALSE@,$compile_kross_FALSE,;t t
+-s, at compile_kross_python_TRUE@,$compile_kross_python_TRUE,;t t
+-s, at compile_kross_python_FALSE@,$compile_kross_python_FALSE,;t t
+-s, at RUBY@,$RUBY,;t t
+-s, at RUBY_ARCHDIR@,$RUBY_ARCHDIR,;t t
+-s, at RUBY_SITEARCHDIR@,$RUBY_SITEARCHDIR,;t t
+-s, at RUBY_SITEDIR@,$RUBY_SITEDIR,;t t
+-s, at RUBY_INCLUDEDIR@,$RUBY_INCLUDEDIR,;t t
+-s, at RUBY_LIBDIR@,$RUBY_LIBDIR,;t t
+-s, at RUBY_LIBRUBYARG@,$RUBY_LIBRUBYARG,;t t
+-s, at RUBY_ENABLESHARED@,$RUBY_ENABLESHARED,;t t
+-s, at compile_kross_ruby_TRUE@,$compile_kross_ruby_TRUE,;t t
+-s, at compile_kross_ruby_FALSE@,$compile_kross_ruby_FALSE,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at lib_SUBDIR_included_TRUE@,$lib_SUBDIR_included_TRUE,;t t
+-s, at lib_SUBDIR_included_FALSE@,$lib_SUBDIR_included_FALSE,;t t
+-s, at interfaces_SUBDIR_included_TRUE@,$interfaces_SUBDIR_included_TRUE,;t t
+-s, at interfaces_SUBDIR_included_FALSE@,$interfaces_SUBDIR_included_FALSE,;t t
+-s, at autocorrect_SUBDIR_included_TRUE@,$autocorrect_SUBDIR_included_TRUE,;t t
+-s, at autocorrect_SUBDIR_included_FALSE@,$autocorrect_SUBDIR_included_FALSE,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at example_SUBDIR_included_TRUE@,$example_SUBDIR_included_TRUE,;t t
+-s, at example_SUBDIR_included_FALSE@,$example_SUBDIR_included_FALSE,;t t
+-s, at karbon_SUBDIR_included_TRUE@,$karbon_SUBDIR_included_TRUE,;t t
+-s, at karbon_SUBDIR_included_FALSE@,$karbon_SUBDIR_included_FALSE,;t t
+-s, at kchart_SUBDIR_included_TRUE@,$kchart_SUBDIR_included_TRUE,;t t
+-s, at kchart_SUBDIR_included_FALSE@,$kchart_SUBDIR_included_FALSE,;t t
+-s, at kdgantt_SUBDIR_included_TRUE@,$kdgantt_SUBDIR_included_TRUE,;t t
+-s, at kdgantt_SUBDIR_included_FALSE@,$kdgantt_SUBDIR_included_FALSE,;t t
+-s, at kformula_SUBDIR_included_TRUE@,$kformula_SUBDIR_included_TRUE,;t t
+-s, at kformula_SUBDIR_included_FALSE@,$kformula_SUBDIR_included_FALSE,;t t
+-s, at kivio_SUBDIR_included_TRUE@,$kivio_SUBDIR_included_TRUE,;t t
+-s, at kivio_SUBDIR_included_FALSE@,$kivio_SUBDIR_included_FALSE,;t t
+-s, at koshell_SUBDIR_included_TRUE@,$koshell_SUBDIR_included_TRUE,;t t
+-s, at koshell_SUBDIR_included_FALSE@,$koshell_SUBDIR_included_FALSE,;t t
+-s, at kounavail_SUBDIR_included_TRUE@,$kounavail_SUBDIR_included_TRUE,;t t
+-s, at kounavail_SUBDIR_included_FALSE@,$kounavail_SUBDIR_included_FALSE,;t t
+-s, at kpresenter_SUBDIR_included_TRUE@,$kpresenter_SUBDIR_included_TRUE,;t t
+-s, at kpresenter_SUBDIR_included_FALSE@,$kpresenter_SUBDIR_included_FALSE,;t t
+-s, at krita_SUBDIR_included_TRUE@,$krita_SUBDIR_included_TRUE,;t t
+-s, at krita_SUBDIR_included_FALSE@,$krita_SUBDIR_included_FALSE,;t t
+-s, at kspread_SUBDIR_included_TRUE@,$kspread_SUBDIR_included_TRUE,;t t
+-s, at kspread_SUBDIR_included_FALSE@,$kspread_SUBDIR_included_FALSE,;t t
+-s, at kugar_SUBDIR_included_TRUE@,$kugar_SUBDIR_included_TRUE,;t t
+-s, at kugar_SUBDIR_included_FALSE@,$kugar_SUBDIR_included_FALSE,;t t
+-s, at mimetypes_SUBDIR_included_TRUE@,$mimetypes_SUBDIR_included_TRUE,;t t
+-s, at mimetypes_SUBDIR_included_FALSE@,$mimetypes_SUBDIR_included_FALSE,;t t
+-s, at pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t
+-s, at pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t
+-s, at plugins_SUBDIR_included_TRUE@,$plugins_SUBDIR_included_TRUE,;t t
+-s, at plugins_SUBDIR_included_FALSE@,$plugins_SUBDIR_included_FALSE,;t t
+-s, at servicetypes_SUBDIR_included_TRUE@,$servicetypes_SUBDIR_included_TRUE,;t t
+-s, at servicetypes_SUBDIR_included_FALSE@,$servicetypes_SUBDIR_included_FALSE,;t t
+-s, at templates_SUBDIR_included_TRUE@,$templates_SUBDIR_included_TRUE,;t t
+-s, at templates_SUBDIR_included_FALSE@,$templates_SUBDIR_included_FALSE,;t t
+-s, at tools_SUBDIR_included_TRUE@,$tools_SUBDIR_included_TRUE,;t t
+-s, at tools_SUBDIR_included_FALSE@,$tools_SUBDIR_included_FALSE,;t t
+-s, at kword_SUBDIR_included_TRUE@,$kword_SUBDIR_included_TRUE,;t t
+-s, at kword_SUBDIR_included_FALSE@,$kword_SUBDIR_included_FALSE,;t t
+-s, at kplato_SUBDIR_included_TRUE@,$kplato_SUBDIR_included_TRUE,;t t
+-s, at kplato_SUBDIR_included_FALSE@,$kplato_SUBDIR_included_FALSE,;t t
+-s, at kexi_SUBDIR_included_TRUE@,$kexi_SUBDIR_included_TRUE,;t t
+-s, at kexi_SUBDIR_included_FALSE@,$kexi_SUBDIR_included_FALSE,;t t
+-s, at filters_SUBDIR_included_TRUE@,$filters_SUBDIR_included_TRUE,;t t
+-s, at filters_SUBDIR_included_FALSE@,$filters_SUBDIR_included_FALSE,;t t
+-s, at compile_filter_KWORD_TRUE@,$compile_filter_KWORD_TRUE,;t t
+-s, at compile_filter_KWORD_FALSE@,$compile_filter_KWORD_FALSE,;t t
+-s, at compile_filter_KSPREAD_TRUE@,$compile_filter_KSPREAD_TRUE,;t t
+-s, at compile_filter_KSPREAD_FALSE@,$compile_filter_KSPREAD_FALSE,;t t
+-s, at compile_filter_KCHART_TRUE@,$compile_filter_KCHART_TRUE,;t t
+-s, at compile_filter_KCHART_FALSE@,$compile_filter_KCHART_FALSE,;t t
+-s, at compile_filter_KARBON_TRUE@,$compile_filter_KARBON_TRUE,;t t
+-s, at compile_filter_KARBON_FALSE@,$compile_filter_KARBON_FALSE,;t t
+-s, at compile_filter_KPRESENTER_TRUE@,$compile_filter_KPRESENTER_TRUE,;t t
+-s, at compile_filter_KPRESENTER_FALSE@,$compile_filter_KPRESENTER_FALSE,;t t
+-s, at compile_filter_KFORMULA_TRUE@,$compile_filter_KFORMULA_TRUE,;t t
+-s, at compile_filter_KFORMULA_FALSE@,$compile_filter_KFORMULA_FALSE,;t t
+-s, at compile_filter_KUGAR_TRUE@,$compile_filter_KUGAR_TRUE,;t t
+-s, at compile_filter_KUGAR_FALSE@,$compile_filter_KUGAR_FALSE,;t t
+-s, at compile_filter_KRITA_TRUE@,$compile_filter_KRITA_TRUE,;t t
+-s, at compile_filter_KRITA_FALSE@,$compile_filter_KRITA_FALSE,;t t
+-s, at compile_filter_KIVIO_TRUE@,$compile_filter_KIVIO_TRUE,;t t
+-s, at compile_filter_KIVIO_FALSE@,$compile_filter_KIVIO_FALSE,;t t
+-s, at compile_plugin_KUGAR_TRUE@,$compile_plugin_KUGAR_TRUE,;t t
+-s, at compile_plugin_KUGAR_FALSE@,$compile_plugin_KUGAR_FALSE,;t t
+-s, at compile_kexionly_TRUE@,$compile_kexionly_TRUE,;t t
+-s, at compile_kexionly_FALSE@,$compile_kexionly_FALSE,;t t
+-s, at compile_lib_KOPAINTER_TRUE@,$compile_lib_KOPAINTER_TRUE,;t t
+-s, at compile_lib_KOPAINTER_FALSE@,$compile_lib_KOPAINTER_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+- cat >>$CONFIG_STATUS <<\_ACEOF
+- # Split the substitutions into bite-sized pieces for seds with
+- # small command number limits, like on Digital OSF/1 and HP-UX.
+- ac_max_sed_lines=48
+- ac_sed_frag=1 # Number of current file.
+- ac_beg=1 # First line for current file.
+- ac_end=$ac_max_sed_lines # Line after last line for current file.
+- ac_more_lines=:
+- ac_sed_cmds=
+- while $ac_more_lines; do
+- if test $ac_beg -gt 1; then
+- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+- else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+- fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+- fi
+- done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
+
-+AC_ARG_WITH(pgsql-includes,
-+AC_HELP_STRING([--with-pgsql-includes=DIR],[use PostgreSQL(libpq)-includes installed in this directory ]),
-+[
-+ ac_pgsql_incdir=$withval
-+], ac_pgsql_incdir=
-+)
++_ACEOF
+
-+AC_ARG_WITH(pgsql-libraries,
-+AC_HELP_STRING([--with-pgsql-libraries=DIR],[use PostgreSQL(libpq)-libraries installed in this directory ]),
-+[
-+ ac_pgsql_libdir=$withval
-+], ac_pgsql_libdir=
-+)
+
+
-+dnl ========================================
-+dnl header/library directories
-+dnl ========================================
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++target!$target$ac_delim
++target_cpu!$target_cpu$ac_delim
++target_vendor!$target_vendor$ac_delim
++target_os!$target_os$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++KDECONFIG!$KDECONFIG$ac_delim
++kde_libs_prefix!$kde_libs_prefix$ac_delim
++kde_libs_htmldir!$kde_libs_htmldir$ac_delim
++CONF_FILES!$CONF_FILES$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++_ACEOF
+
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
-+dnl *** Configure arguments for includes or libs given ***
-+dnl *** and PostgreSQL not explicitly disabled. ***
-+dnl *** Check that the paths given to configure are valid ***
-+ AC_MSG_CHECKING([for PostgreSQL C API headers])
-+ pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
-+ AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
-+ if test -r $pgsql_incdir/libpq-fe.h; then
-+ PG_INCDIR=$pgsql_incdir
-+ AC_MSG_RESULT([$PG_INCDIR])
-+ AC_SUBST(PG_INCDIR)
-+ else
-+ compile_pgsql_plugin="no"
-+ AC_MSG_RESULT([not found])
-+ fi
-+
-+ AC_MSG_CHECKING([for PostgreSQL C API libraries])
-+ pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+ AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
-+ if test -r $pgsql_libdir/libpq.so; then
-+ PG_LIBDIR=$pgsql_libdir
-+ AC_MSG_RESULT([$PG_LIBDIR])
-+ AC_SUBST(PG_LIBDIR)
-+ else
-+ compile_pgsql_plugin="no"
-+ AC_MSG_RESULT([not found])
-+ fi
++ 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
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
+ else
-+dnl *** No configure arguments for includes or libs given ***
-+dnl *** and PostgreSQL not explicitly disabled. ***
-+ KDE_FIND_PATH(pg_config, PG_CONFIG,
-+ [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [
-+ AC_MSG_RESULT([not found])
-+ ])
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+-fi # test -n "$CONFIG_FILES"
++done
+
-+ if test -n "$PG_CONFIG"; then
-+ pgsql_incdir=`$PG_CONFIG --includedir`
-+ pgsql_libdir=`$PG_CONFIG --libdir`
-+ PG_INCDIR=$pgsql_incdir
-+ PG_LIBDIR=$pgsql_libdir
-+ AC_SUBST(PG_LIBDIR)
-+ compile_pgsql_plugin="yes"
-+ AC_MSG_RESULT([headers $pgsql_incdir, libraries $pgsql_libdir])
-+ else
-+ compile_pgsql_plugin="no"
-+ fi
-+ fi
-+else
-+dnl *** PostgreSQL plugin explicitly disabled. ***
-+dnl *** Show that we are doing as requested. ***
-+ AC_MSG_NOTICE([Not attempting to configure PostgreSQL as requested])
++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
+
-+AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes")
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
+
+
-+dnl ========================================
-+dnl libpqxx checks
-+dnl ========================================
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
++HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
++unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
++unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
++USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
++USE_RTTI!$USE_RTTI$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
++NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
++ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
++LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
++LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
++KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
++KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
++KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
++KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
++KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
++KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
++KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++KDE_PLUGIN!$KDE_PLUGIN$ac_delim
++KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++LIBUTIL!$LIBUTIL$ac_delim
++LIBCOMPAT!$LIBCOMPAT$ac_delim
++LIBCRYPT!$LIBCRYPT$ac_delim
++LIBRESOLV!$LIBRESOLV$ac_delim
++LIB_POLL!$LIB_POLL$ac_delim
++FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
++LIBSOCKET!$LIBSOCKET$ac_delim
++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
++LIBUCB!$LIBUCB$ac_delim
++LIBDL!$LIBDL$ac_delim
++KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
++KDE_USE_PIE!$KDE_USE_PIE$ac_delim
++include_x11_TRUE!$include_x11_TRUE$ac_delim
++include_x11_FALSE!$include_x11_FALSE$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++LIB_X11!$LIB_X11$ac_delim
++LIB_XRENDER!$LIB_XRENDER$ac_delim
++LIBSM!$LIBSM$ac_delim
++X_INCLUDES!$X_INCLUDES$ac_delim
++X_LDFLAGS!$X_LDFLAGS$ac_delim
++x_includes!$x_includes$ac_delim
++x_libraries!$x_libraries$ac_delim
++QTE_NORTTI!$QTE_NORTTI$ac_delim
++LIB_XEXT!$LIB_XEXT$ac_delim
++LIBPTHREAD!$LIBPTHREAD$ac_delim
++USE_THREADS!$USE_THREADS$ac_delim
++KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
++KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
++USER_INCLUDES!$USER_INCLUDES$ac_delim
++USER_LDFLAGS!$USER_LDFLAGS$ac_delim
++LIBZ!$LIBZ$ac_delim
++LIBPNG!$LIBPNG$ac_delim
++LIBJPEG!$LIBJPEG$ac_delim
++qt_libraries!$qt_libraries$ac_delim
++qt_includes!$qt_includes$ac_delim
++QT_INCLUDES!$QT_INCLUDES$ac_delim
++QT_LDFLAGS!$QT_LDFLAGS$ac_delim
++PERL!$PERL$ac_delim
++MOC!$MOC$ac_delim
++UIC!$UIC$ac_delim
++UIC_TR!$UIC_TR$ac_delim
++LIB_QT!$LIB_QT$ac_delim
++LIB_QPE!$LIB_QPE$ac_delim
++kde_qtver!$kde_qtver$ac_delim
++KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
++KDE_RPATH!$KDE_RPATH$ac_delim
++X_RPATH!$X_RPATH$ac_delim
++kde_libraries!$kde_libraries$ac_delim
++kde_includes!$kde_includes$ac_delim
++KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
++KDE_INCLUDES!$KDE_INCLUDES$ac_delim
++all_includes!$all_includes$ac_delim
++all_libraries!$all_libraries$ac_delim
++AUTODIRS!$AUTODIRS$ac_delim
++include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
++include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++_ACEOF
+
-+AC_ARG_WITH(pqxx-includes,
-+AC_HELP_STRING([--with-pqxx-includes=DIR],[use PostgreSQL(libpqxx)-includes installed in this directory ]),
-+[
-+ ac_pqxx_incdir=$withval
-+], ac_pqxx_incdir=
-+)
-+
-+AC_ARG_WITH(pqxx-libraries,
-+AC_HELP_STRING([--with-pqxx-libraries=DIR],[use PostgreSQL(libpqxx)-libraries installed in this directory ]),
-+[
-+ ac_pqxx_libdir=$withval
-+], ac_pqxx_libdir=
-+)
-+
-+
-+dnl ========================================
-+dnl libpqxx headers
-+dnl ========================================
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ AC_MSG_CHECKING([for PostgreSQL C++ includes])
-+ pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
-+ AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir)
-+ if test -r $pqxx_incdir/pqxx/pqxx; then
-+ PQXX_INCDIR=$pqxx_incdir
-+ AC_MSG_RESULT([$PQXX_INCDIR])
-+ AC_SUBST(PQXX_INCDIR)
++ 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
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
+ else
-+ compile_pgsql_plugin="no"
-+ AC_MSG_RESULT([not found])
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
-+fi
++done
+
-+dnl ========================================
-+dnl libpqxx libraries
-+dnl ========================================
-+if test "$compile_pgsql_plugin" = "yes"; then
-+ AC_MSG_CHECKING([for PostgreSQL C++ libraries])
-+ pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
-+ AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
-+ if test -r $pqxx_libdir/libpqxx.so; then
-+ PQXX_LIBDIR=$pqxx_libdir
-+ AC_MSG_RESULT([$PQXX_LIBDIR])
-+ AC_SUBST(PQXX_LIBDIR)
-+ else
-+ compile_pgsql_plugin="no"
-+ AC_MSG_RESULT([not found])
-+ fi
++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
+
-+AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/main/configure.in.in
-+dnl =======================================================
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
+
+
-+dnl ======================================
-+dnl KNewStuff Configuration
-+dnl ======================================
-+dnl
-+dnl Copyright (C) 2004 Josef Spillner <spillner at kde.org>
-+dnl This file is to be used within KDE's build system.
-+dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found,
-+dnl and a HAVE_KNEWSTUFF #define statement is added.
-+dnl
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++DCOPIDLNG!$DCOPIDLNG$ac_delim
++DCOPIDL!$DCOPIDL$ac_delim
++DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
++DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
++MCOPIDL!$MCOPIDL$ac_delim
++ARTSCCONFIG!$ARTSCCONFIG$ac_delim
++MEINPROC!$MEINPROC$ac_delim
++KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
++XMLLINT!$XMLLINT$ac_delim
++kde_htmldir!$kde_htmldir$ac_delim
++kde_appsdir!$kde_appsdir$ac_delim
++kde_icondir!$kde_icondir$ac_delim
++kde_sounddir!$kde_sounddir$ac_delim
++kde_datadir!$kde_datadir$ac_delim
++kde_locale!$kde_locale$ac_delim
++kde_confdir!$kde_confdir$ac_delim
++kde_kcfgdir!$kde_kcfgdir$ac_delim
++kde_mimedir!$kde_mimedir$ac_delim
++kde_wallpaperdir!$kde_wallpaperdir$ac_delim
++kde_bindir!$kde_bindir$ac_delim
++xdg_appsdir!$xdg_appsdir$ac_delim
++xdg_menudir!$xdg_menudir$ac_delim
++xdg_directorydir!$xdg_directorydir$ac_delim
++kde_templatesdir!$kde_templatesdir$ac_delim
++kde_servicesdir!$kde_servicesdir$ac_delim
++kde_servicetypesdir!$kde_servicetypesdir$ac_delim
++kde_moduledir!$kde_moduledir$ac_delim
++kdeinitdir!$kdeinitdir$ac_delim
++kde_styledir!$kde_styledir$ac_delim
++kde_widgetdir!$kde_widgetdir$ac_delim
++LIB_KDED!$LIB_KDED$ac_delim
++LIB_KDECORE!$LIB_KDECORE$ac_delim
++LIB_KDEUI!$LIB_KDEUI$ac_delim
++LIB_KIO!$LIB_KIO$ac_delim
++LIB_KJS!$LIB_KJS$ac_delim
++LIB_SMB!$LIB_SMB$ac_delim
++LIB_KAB!$LIB_KAB$ac_delim
++LIB_KABC!$LIB_KABC$ac_delim
++LIB_KHTML!$LIB_KHTML$ac_delim
++LIB_KSPELL!$LIB_KSPELL$ac_delim
++LIB_KPARTS!$LIB_KPARTS$ac_delim
++LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
++LIB_KUTILS!$LIB_KUTILS$ac_delim
++LIB_KDEPIM!$LIB_KDEPIM$ac_delim
++LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
++LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
++LIB_KDNSSD!$LIB_KDNSSD$ac_delim
++LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
++LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
++LIB_KFILE!$LIB_KFILE$ac_delim
++LIB_KFM!$LIB_KFM$ac_delim
++QTDOCDIR!$QTDOCDIR$ac_delim
++KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
++DOXYGEN!$DOXYGEN$ac_delim
++DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
++DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
++KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
++LIBMAGICK_LIBS!$LIBMAGICK_LIBS$ac_delim
++LIBMAGICK_LDFLAGS!$LIBMAGICK_LDFLAGS$ac_delim
++LIBMAGICK_CPPFLAGS!$LIBMAGICK_CPPFLAGS$ac_delim
++LIBMAGICK_RPATH!$LIBMAGICK_RPATH$ac_delim
++include_imagemagick_filter_TRUE!$include_imagemagick_filter_TRUE$ac_delim
++include_imagemagick_filter_FALSE!$include_imagemagick_filter_FALSE$ac_delim
++need_kde32_compatibility_TRUE!$need_kde32_compatibility_TRUE$ac_delim
++need_kde32_compatibility_FALSE!$need_kde32_compatibility_FALSE$ac_delim
++need_kde33_compatibility_TRUE!$need_kde33_compatibility_TRUE$ac_delim
++need_kde33_compatibility_FALSE!$need_kde33_compatibility_FALSE$ac_delim
++need_kde34_compatibility_TRUE!$need_kde34_compatibility_TRUE$ac_delim
++need_kde34_compatibility_FALSE!$need_kde34_compatibility_FALSE$ac_delim
++need_kde351_compatibility_TRUE!$need_kde351_compatibility_TRUE$ac_delim
++need_kde351_compatibility_FALSE!$need_kde351_compatibility_FALSE$ac_delim
++need_kde31_compatibility_TRUE!$need_kde31_compatibility_TRUE$ac_delim
++need_kde31_compatibility_FALSE!$need_kde31_compatibility_FALSE$ac_delim
++OPENEXR_LIBS!$OPENEXR_LIBS$ac_delim
++OPENEXR_CFLAGS!$OPENEXR_CFLAGS$ac_delim
++OPENEXR_RPATH!$OPENEXR_RPATH$ac_delim
++have_openexr_TRUE!$have_openexr_TRUE$ac_delim
++have_openexr_FALSE!$have_openexr_FALSE$ac_delim
++LIBTIFF!$LIBTIFF$ac_delim
++have_tiff_TRUE!$have_tiff_TRUE$ac_delim
++have_tiff_FALSE!$have_tiff_FALSE$ac_delim
++have_png_TRUE!$have_png_TRUE$ac_delim
++have_png_FALSE!$have_png_FALSE$ac_delim
++have_jpeg_TRUE!$have_jpeg_TRUE$ac_delim
++have_jpeg_FALSE!$have_jpeg_FALSE$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++LIBEXIF_CFLAGS!$LIBEXIF_CFLAGS$ac_delim
++LIBEXIF_LIBS!$LIBEXIF_LIBS$ac_delim
++have_exif_TRUE!$have_exif_TRUE$ac_delim
++have_exif_FALSE!$have_exif_FALSE$ac_delim
++include_jpeg_filter_TRUE!$include_jpeg_filter_TRUE$ac_delim
++include_jpeg_filter_FALSE!$include_jpeg_filter_FALSE$ac_delim
++include_tiff_filter_TRUE!$include_tiff_filter_TRUE$ac_delim
++include_tiff_filter_FALSE!$include_tiff_filter_FALSE$ac_delim
++LIBWV2_LIBS!$LIBWV2_LIBS$ac_delim
++LIBWV2_CFLAGS!$LIBWV2_CFLAGS$ac_delim
++LIBWV2_RPATH!$LIBWV2_RPATH$ac_delim
++_ACEOF
+
-+AC_MSG_CHECKING([for KDE library: knewstuff])
++ 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
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
+
-+ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
-+knewstuff_libraries=""
-+knewstuff_includes=""
-+
-+AC_CACHE_VAL(ac_cv_have_knewstuff,
-+[
-+AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
-+ac_knewstuff_includes="$knewstuff_incdir"
-+
-+AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)
-+ac_knewstuff_libraries="$knewstuff_libdir"
-+
-+if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
-+ ac_cv_have_knewstuff="have_knewstuff=no"
-+ ac_knewstuff_notfound=""
-+else
-+ have_knewstuff="yes"
++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
-+])
+
-+eval "$ac_cv_have_knewstuff"
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
+
-+if test "$have_knewstuff" != yes; then
-+ AC_MSG_RESULT([$have_knewstuff])
-+else
-+ AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)])
+
-+dnl AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.])
-+ CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++include_wv2_msword_filter_TRUE!$include_wv2_msword_filter_TRUE$ac_delim
++include_wv2_msword_filter_FALSE!$include_wv2_msword_filter_FALSE$ac_delim
++LIBPAPER!$LIBPAPER$ac_delim
++LIBWPD_LIBS!$LIBWPD_LIBS$ac_delim
++LIBWPD_CFLAGS!$LIBWPD_CFLAGS$ac_delim
++LIBWPD_RPATH!$LIBWPD_RPATH$ac_delim
++include_wpd_filter_TRUE!$include_wpd_filter_TRUE$ac_delim
++include_wpd_filter_FALSE!$include_wpd_filter_FALSE$ac_delim
++LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
++LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
++LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
++LIBXML_LIBS!$LIBXML_LIBS$ac_delim
++LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
++LIBXML_RPATH!$LIBXML_RPATH$ac_delim
++include_XSLTFILTERS_TRUE!$include_XSLTFILTERS_TRUE$ac_delim
++include_XSLTFILTERS_FALSE!$include_XSLTFILTERS_FALSE$ac_delim
++LIBFREETYPE_LIBS!$LIBFREETYPE_LIBS$ac_delim
++LIBFREETYPE_CFLAGS!$LIBFREETYPE_CFLAGS$ac_delim
++LIBFREETYPE_RPATH!$LIBFREETYPE_RPATH$ac_delim
++LIBART_LIBS!$LIBART_LIBS$ac_delim
++LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim
++LIBART_RPATH!$LIBART_RPATH$ac_delim
++LIBFONTCONFIG_LIBS!$LIBFONTCONFIG_LIBS$ac_delim
++LIBFONTCONFIG_CFLAGS!$LIBFONTCONFIG_CFLAGS$ac_delim
++LIBFONTCONFIG_RPATH!$LIBFONTCONFIG_RPATH$ac_delim
++have_readline_TRUE!$have_readline_TRUE$ac_delim
++have_readline_FALSE!$have_readline_FALSE$ac_delim
++LIBREADLINE!$LIBREADLINE$ac_delim
++LIB_KEXI_KMDI!$LIB_KEXI_KMDI$ac_delim
++LIB_KEXI_KMDI_INCLUDES!$LIB_KEXI_KMDI_INCLUDES$ac_delim
++MYSQL_INC!$MYSQL_INC$ac_delim
++MYSQL_LIBS!$MYSQL_LIBS$ac_delim
++compile_mysql_plugin_TRUE!$compile_mysql_plugin_TRUE$ac_delim
++compile_mysql_plugin_FALSE!$compile_mysql_plugin_FALSE$ac_delim
++PG_INCDIR!$PG_INCDIR$ac_delim
++PG_LIBDIR!$PG_LIBDIR$ac_delim
++compile_pgsql_plugin_TRUE!$compile_pgsql_plugin_TRUE$ac_delim
++compile_pgsql_plugin_FALSE!$compile_pgsql_plugin_FALSE$ac_delim
++PQXX_INCDIR!$PQXX_INCDIR$ac_delim
++PQXX_LIBDIR!$PQXX_LIBDIR$ac_delim
++LIB_KFEEDBACK!$LIB_KFEEDBACK$ac_delim
++INC_KFEEDBACK!$INC_KFEEDBACK$ac_delim
++use_kexifeedback_TRUE!$use_kexifeedback_TRUE$ac_delim
++use_kexifeedback_FALSE!$use_kexifeedback_FALSE$ac_delim
++PYTHONINC!$PYTHONINC$ac_delim
++PYTHONLIB!$PYTHONLIB$ac_delim
++LIBPYTHON!$LIBPYTHON$ac_delim
++PYTHONMODDIR!$PYTHONMODDIR$ac_delim
++LIB_XINPUTEXT!$LIB_XINPUTEXT$ac_delim
++LCMS_LIBS!$LCMS_LIBS$ac_delim
++include_kunittest_tests_TRUE!$include_kunittest_tests_TRUE$ac_delim
++include_kunittest_tests_FALSE!$include_kunittest_tests_FALSE$ac_delim
++GLINC!$GLINC$ac_delim
++GLLIB!$GLLIB$ac_delim
++use_kjsembed_TRUE!$use_kjsembed_TRUE$ac_delim
++use_kjsembed_FALSE!$use_kjsembed_FALSE$ac_delim
++SQLDIR!$SQLDIR$ac_delim
++include_sql_TRUE!$include_sql_TRUE$ac_delim
++include_sql_FALSE!$include_sql_FALSE$ac_delim
++KWMF_INCLUDES!$KWMF_INCLUDES$ac_delim
++KSTORE_INCLUDES!$KSTORE_INCLUDES$ac_delim
++KOTEXT_INCLUDES!$KOTEXT_INCLUDES$ac_delim
++KOPAINTER_INCLUDES!$KOPAINTER_INCLUDES$ac_delim
++KOPALETTE_INCLUDES!$KOPALETTE_INCLUDES$ac_delim
++KOFFICECORE_INCLUDES!$KOFFICECORE_INCLUDES$ac_delim
++KOFFICEUI_INCLUDES!$KOFFICEUI_INCLUDES$ac_delim
++KFORMULA_INCLUDES!$KFORMULA_INCLUDES$ac_delim
++KOPROPERTY_INCLUDES!$KOPROPERTY_INCLUDES$ac_delim
++KROSS_INCLUDES!$KROSS_INCLUDES$ac_delim
++LIB_KOFFICEUI!$LIB_KOFFICEUI$ac_delim
++LIB_KOFFICECORE!$LIB_KOFFICECORE$ac_delim
++LIB_KSTORE!$LIB_KSTORE$ac_delim
++LIB_KOTEXT!$LIB_KOTEXT$ac_delim
++LIB_KOPAINTER!$LIB_KOPAINTER$ac_delim
++LIB_KOPALETTE!$LIB_KOPALETTE$ac_delim
++LIB_KWMF!$LIB_KWMF$ac_delim
++LIB_KOWMF!$LIB_KOWMF$ac_delim
++LIB_KFORMULA!$LIB_KFORMULA$ac_delim
++LIB_KOPROPERTY!$LIB_KOPROPERTY$ac_delim
++LIB_KROSS_API!$LIB_KROSS_API$ac_delim
++LIB_KROSS_MAIN!$LIB_KROSS_MAIN$ac_delim
++interfacedir!$interfacedir$ac_delim
++KOFFICE_LIBS!$KOFFICE_LIBS$ac_delim
++KOFFICE_INCLUDES!$KOFFICE_INCLUDES$ac_delim
++LIBKSPELL2!$LIBKSPELL2$ac_delim
++compile_kross_TRUE!$compile_kross_TRUE$ac_delim
++compile_kross_FALSE!$compile_kross_FALSE$ac_delim
++compile_kross_python_TRUE!$compile_kross_python_TRUE$ac_delim
++compile_kross_python_FALSE!$compile_kross_python_FALSE$ac_delim
++RUBY!$RUBY$ac_delim
++RUBY_ARCHDIR!$RUBY_ARCHDIR$ac_delim
++RUBY_SITEARCHDIR!$RUBY_SITEARCHDIR$ac_delim
++RUBY_SITEDIR!$RUBY_SITEDIR$ac_delim
++RUBY_INCLUDEDIR!$RUBY_INCLUDEDIR$ac_delim
++RUBY_LIBDIR!$RUBY_LIBDIR$ac_delim
++RUBY_LIBRUBYARG!$RUBY_LIBRUBYARG$ac_delim
++RUBY_ENABLESHARED!$RUBY_ENABLESHARED$ac_delim
++_ACEOF
+
-+ LIB_KNEWSTUFF='-lknewstuff'
-+ AC_SUBST(LIB_KNEWSTUFF)
-+fi
-+
-+AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],
-+ have_internal_feedback="yes"
-+,
-+ have_internal_feedback="no"
-+)
-+
-+AC_MSG_CHECKING([for KDE library: kfeedbackwizard])
-+
-+ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
-+kfeedback_libraries=""
-+kfeedback_includes=""
-+
-+AC_CACHE_VAL(ac_cv_have_kfeedback,
-+[
-+AC_FIND_FILE(kfeedbackwizard.h, $kde_incdirs, kfeedback_incdir)
-+ac_kfeedback_includes="$kfeedback_incdir"
-+
-+AC_FIND_FILE(libkfeedbackwizard.so, $kde_libdirs, kfeedback_libdir)
-+ac_kfeedback_libraries="$kfeedback_libdir"
-+
-+if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then
-+ ac_cv_have_kfeedback="have_kfeedback=no"
-+ ac_kfeedback_notfound=""
-+else
-+ have_kfeedback="yes"
-+fi
-+])
-+
-+eval "$ac_cv_have_kfeedback"
-+
-+INC_KFEEDBACK=''
-+LIB_KFEEDBACK=''
-+if test "$have_kfeedback" != yes; then
-+ if test "$have_internal_feedback" = yes; then
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
-+ use_kexifb="yes"
-+ AC_MSG_RESULT([using internal])
-+ INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
-+ LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
++ 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
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
+ else
-+ use_kexifb="no"
-+ AC_MSG_RESULT([dont use])
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
-+else
-+ use_kexifb="no"
-+ AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])
++done
+
-+dnl AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.])
-+ CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
-+
-+ LIB_KFEEDBACK='-lkfeedbackwizard'
++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
-+AC_SUBST(LIB_KFEEDBACK)
-+AC_SUBST(INC_KFEEDBACK)
-+AM_CONDITIONAL(use_kexifeedback, test "$use_kexifb" = "yes")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/migration/configure.in.in
-+dnl =======================================================
+
-+# KexiMDB isn't built as part of Kexi right now.
-+#AC_ARG_ENABLE(keximdb,
-+# AC_HELP_STRING([--enable-keximdb],
-+# [build KexiMDB (MS Access) plugin [default=no]]),
-+# compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no)
-+#
-+#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kexi/plugins/configure.in.in
-+dnl =======================================================
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
+
-+AC_ARG_ENABLE(kexi-reports,
-+ AC_HELP_STRING([--enable-kexi-reports],
-+ [build Kexi reports plugin (EXPERIMENTAL) [default=no]]),
-+ compile_kexi_reports_plugin=$enableval, compile_kexi_reports_plugin=no)
-+AM_CONDITIONAL(compile_kexi_reports_plugin, test "x$compile_kexi_reports_plugin" != "xno")
+
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++compile_kross_ruby_TRUE!$compile_kross_ruby_TRUE$ac_delim
++compile_kross_ruby_FALSE!$compile_kross_ruby_FALSE$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++lib_SUBDIR_included_TRUE!$lib_SUBDIR_included_TRUE$ac_delim
++lib_SUBDIR_included_FALSE!$lib_SUBDIR_included_FALSE$ac_delim
++interfaces_SUBDIR_included_TRUE!$interfaces_SUBDIR_included_TRUE$ac_delim
++interfaces_SUBDIR_included_FALSE!$interfaces_SUBDIR_included_FALSE$ac_delim
++autocorrect_SUBDIR_included_TRUE!$autocorrect_SUBDIR_included_TRUE$ac_delim
++autocorrect_SUBDIR_included_FALSE!$autocorrect_SUBDIR_included_FALSE$ac_delim
++doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
++doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
++example_SUBDIR_included_TRUE!$example_SUBDIR_included_TRUE$ac_delim
++example_SUBDIR_included_FALSE!$example_SUBDIR_included_FALSE$ac_delim
++karbon_SUBDIR_included_TRUE!$karbon_SUBDIR_included_TRUE$ac_delim
++karbon_SUBDIR_included_FALSE!$karbon_SUBDIR_included_FALSE$ac_delim
++kchart_SUBDIR_included_TRUE!$kchart_SUBDIR_included_TRUE$ac_delim
++kchart_SUBDIR_included_FALSE!$kchart_SUBDIR_included_FALSE$ac_delim
++kdgantt_SUBDIR_included_TRUE!$kdgantt_SUBDIR_included_TRUE$ac_delim
++kdgantt_SUBDIR_included_FALSE!$kdgantt_SUBDIR_included_FALSE$ac_delim
++kformula_SUBDIR_included_TRUE!$kformula_SUBDIR_included_TRUE$ac_delim
++kformula_SUBDIR_included_FALSE!$kformula_SUBDIR_included_FALSE$ac_delim
++kivio_SUBDIR_included_TRUE!$kivio_SUBDIR_included_TRUE$ac_delim
++kivio_SUBDIR_included_FALSE!$kivio_SUBDIR_included_FALSE$ac_delim
++koshell_SUBDIR_included_TRUE!$koshell_SUBDIR_included_TRUE$ac_delim
++koshell_SUBDIR_included_FALSE!$koshell_SUBDIR_included_FALSE$ac_delim
++kounavail_SUBDIR_included_TRUE!$kounavail_SUBDIR_included_TRUE$ac_delim
++kounavail_SUBDIR_included_FALSE!$kounavail_SUBDIR_included_FALSE$ac_delim
++kpresenter_SUBDIR_included_TRUE!$kpresenter_SUBDIR_included_TRUE$ac_delim
++kpresenter_SUBDIR_included_FALSE!$kpresenter_SUBDIR_included_FALSE$ac_delim
++krita_SUBDIR_included_TRUE!$krita_SUBDIR_included_TRUE$ac_delim
++krita_SUBDIR_included_FALSE!$krita_SUBDIR_included_FALSE$ac_delim
++kspread_SUBDIR_included_TRUE!$kspread_SUBDIR_included_TRUE$ac_delim
++kspread_SUBDIR_included_FALSE!$kspread_SUBDIR_included_FALSE$ac_delim
++kugar_SUBDIR_included_TRUE!$kugar_SUBDIR_included_TRUE$ac_delim
++kugar_SUBDIR_included_FALSE!$kugar_SUBDIR_included_FALSE$ac_delim
++mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
++mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
++pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim
++pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim
++plugins_SUBDIR_included_TRUE!$plugins_SUBDIR_included_TRUE$ac_delim
++plugins_SUBDIR_included_FALSE!$plugins_SUBDIR_included_FALSE$ac_delim
++servicetypes_SUBDIR_included_TRUE!$servicetypes_SUBDIR_included_TRUE$ac_delim
++servicetypes_SUBDIR_included_FALSE!$servicetypes_SUBDIR_included_FALSE$ac_delim
++templates_SUBDIR_included_TRUE!$templates_SUBDIR_included_TRUE$ac_delim
++templates_SUBDIR_included_FALSE!$templates_SUBDIR_included_FALSE$ac_delim
++tools_SUBDIR_included_TRUE!$tools_SUBDIR_included_TRUE$ac_delim
++tools_SUBDIR_included_FALSE!$tools_SUBDIR_included_FALSE$ac_delim
++kword_SUBDIR_included_TRUE!$kword_SUBDIR_included_TRUE$ac_delim
++kword_SUBDIR_included_FALSE!$kword_SUBDIR_included_FALSE$ac_delim
++kplato_SUBDIR_included_TRUE!$kplato_SUBDIR_included_TRUE$ac_delim
++kplato_SUBDIR_included_FALSE!$kplato_SUBDIR_included_FALSE$ac_delim
++kexi_SUBDIR_included_TRUE!$kexi_SUBDIR_included_TRUE$ac_delim
++kexi_SUBDIR_included_FALSE!$kexi_SUBDIR_included_FALSE$ac_delim
++filters_SUBDIR_included_TRUE!$filters_SUBDIR_included_TRUE$ac_delim
++filters_SUBDIR_included_FALSE!$filters_SUBDIR_included_FALSE$ac_delim
++compile_filter_KWORD_TRUE!$compile_filter_KWORD_TRUE$ac_delim
++compile_filter_KWORD_FALSE!$compile_filter_KWORD_FALSE$ac_delim
++compile_filter_KSPREAD_TRUE!$compile_filter_KSPREAD_TRUE$ac_delim
++compile_filter_KSPREAD_FALSE!$compile_filter_KSPREAD_FALSE$ac_delim
++compile_filter_KCHART_TRUE!$compile_filter_KCHART_TRUE$ac_delim
++compile_filter_KCHART_FALSE!$compile_filter_KCHART_FALSE$ac_delim
++compile_filter_KARBON_TRUE!$compile_filter_KARBON_TRUE$ac_delim
++compile_filter_KARBON_FALSE!$compile_filter_KARBON_FALSE$ac_delim
++compile_filter_KPRESENTER_TRUE!$compile_filter_KPRESENTER_TRUE$ac_delim
++compile_filter_KPRESENTER_FALSE!$compile_filter_KPRESENTER_FALSE$ac_delim
++compile_filter_KFORMULA_TRUE!$compile_filter_KFORMULA_TRUE$ac_delim
++compile_filter_KFORMULA_FALSE!$compile_filter_KFORMULA_FALSE$ac_delim
++compile_filter_KUGAR_TRUE!$compile_filter_KUGAR_TRUE$ac_delim
++compile_filter_KUGAR_FALSE!$compile_filter_KUGAR_FALSE$ac_delim
++compile_filter_KRITA_TRUE!$compile_filter_KRITA_TRUE$ac_delim
++compile_filter_KRITA_FALSE!$compile_filter_KRITA_FALSE$ac_delim
++compile_filter_KIVIO_TRUE!$compile_filter_KIVIO_TRUE$ac_delim
++compile_filter_KIVIO_FALSE!$compile_filter_KIVIO_FALSE$ac_delim
++compile_plugin_KUGAR_TRUE!$compile_plugin_KUGAR_TRUE$ac_delim
++compile_plugin_KUGAR_FALSE!$compile_plugin_KUGAR_FALSE$ac_delim
++compile_kexionly_TRUE!$compile_kexionly_TRUE$ac_delim
++compile_kexionly_FALSE!$compile_kexionly_FALSE$ac_delim
++compile_lib_KOPAINTER_TRUE!$compile_lib_KOPAINTER_TRUE$ac_delim
++compile_lib_KOPAINTER_FALSE!$compile_lib_KOPAINTER_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
-+if test "$compile_kexi_reports_plugin" == "yes"; then
-+ AC_DEFINE(KEXI_REPORTS_SUPPORT, 1, [build Kexi reports plugin])
-+fi
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kivio/configure.in.in
-+dnl =======================================================
-+
-+dnl Do we have Python?
-+KDE_CHECK_PYTHON
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/krita/configure.in.in
-+dnl =======================================================
-+
-+KDE_CHECK_LIB(Xi, XOpenDisplay, [
-+ LIB_XINPUTEXT="-lXi"
-+ AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension])
-+ ])
-+AC_SUBST(LIB_XINPUTEXT)
-+
-+# Check for lcms
-+AC_MSG_CHECKING([for lcms >= 1.12])
-+
-+have_lcms_header='no'
-+KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
-+if test "$have_lcms_header" = 'yes'
-+then
-+ AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header])
-+
-+ echo "#include <lcms/lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
-+
-+else
-+ # Alternative! Debian does it this way...
-+ KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
-+
-+ AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
-+
-+ echo "#include <lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
-+fi
-+
-+
-+ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext -llcms 1>&5'
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+ AC_MSG_RESULT(yes)
-+ HAVELCMS="yes"
-+ LCMS_LIBS="-llcms"
-+else
-+ AC_MSG_RESULT(no)
-+ HAVELCMS="no"
-+ LCMS_LIBS=""
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
-+fi
-+
-+AC_SUBST(LCMS_LIBS)
-+
-+# Check if the 1.14 version of lcms is detected
-+if test ! "$LCMS_LIBS" = ""
-+then
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+AC_TRY_COMPILE(
-+ [#include LCMS_HEADER
-+ #if LCMS_VERSION == 114
-+ #error lcms 1.14 detected
-+ #endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
-+AC_LANG_RESTORE
-+fi
-+
-+# IM 6.1.3 changed the number of arguments to GetMagickInfoList
-+
-+AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments)
-+CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags
-+CPPFLAGS="$LIBMAGICK_CPPFLAGS"
-+
-+AC_TRY_COMPILE(
-+ [#include <stdio.h>
-+ #if HAVE_SYS_TYPES_H
-+ #include <sys/types.h>
-+ #endif
-+ #include "magick/api.h"],
-+ [const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)],
-+ magick_info_list='yes',
-+ magick_info_list='no')
-+
-+CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags
-+
-+if test "$magick_info_list" = 'yes'; then
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3])
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
-+# Check for kunittest
-+AC_MSG_CHECKING([for kunittest])
-+
-+have_kunittest_header="no"
-+KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
-+AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes")
-+
-+# --- OpenGL check ---
-+
-+AC_HAVE_GL( [], [] )
-+
-+# --- End of OpenGL check ---
-+
-+# Check for powf.
-+
-+AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])])
-+
-+if test "$have_powf" = 'yes'; then
-+ AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in <maths.h>])
-+fi
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/krita/plugins/configure.in.in
-+dnl =======================================================
-+
-+KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no)
-+AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes)
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/krita/plugins/viewplugins/imagesize/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_DECLS([round], [], [], [#include <math.h>])
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kspread/plugins/calculator/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_HEADERS(ieeefp.h)
-+
-+AC_CHECK_FUNCS(fabsl)
-+
-+AC_DEFUN([KDE_C_LONG_DOUBLE],
-+[
-+ AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
-+ [
-+ AC_TRY_RUN(
-+ [
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <math.h>
-+
-+int main() {
-+/* The Stardent Vistra knows sizeof(long double), but does not support it. */
-+long double foo = 1.0;
-+char buffer[10];
-+/* On Ultrix 4.3 cc, long double is 4 and double is 8. */
-+int result = (sizeof(long double) < sizeof(double));
-+/* the following is needed for a broken printf in glibc2 */
-+if (!result) {
-+ foo = foo * 3;
-+ sprintf(buffer,"%0.0Lf",foo);
-+ result = strcmp(buffer, "3");
-+/* and now something mean ;-) */
-+ foo = powl(fabsl(foo), 1);
-+}
-+exit(result); }
-+ ],
-+ ac_cv_c_long_double=yes, ac_cv_c_long_double=no,
-+ ac_cv_c_long_double=no
-+ )
-+ ])
-+ if test $ac_cv_c_long_double = yes; then
-+ AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have support for long double in printf])
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
++ break
++ elif $ac_last_try; then
++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++ { (exit 1); exit 1; }; }
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
-+])
-+KDE_C_LONG_DOUBLE
++done
+
-+AC_LANG_C
-+KDE_CHECK_LIB(m, isinf, [
-+ AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf])
-+])
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/kword/mailmerge/configure.in.in
-+dnl =======================================================
-+
-+dnl only compile the sql plugin if qt was compiled with sql support
-+
-+
-+AC_MSG_CHECKING([for SQL support in QT])
-+
-+LIBS_SAVE_KWSL="$LIBS"
-+CXXFLAGS_SAVE_KWSL="$CXXFLAGS"
-+CFLAGS_SAVE_KWSL="$CFLAGS"
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+
-+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-+CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes"
-+
-+AC_TRY_COMPILE([
-+#include <qglobal.h>
-+],
-+[
-+#ifdef QT_NO_SQL
-+#error "No QT-SQL support"
-+#endif
-+],
-+ac_trycompile_kwsl_qtsql=yes,
-+ac_trycompile_kwsl_qtsql=no)
-+
-+CXXFLAGS="$CXXFLAGS_SAVE_KWSL"
-+LIBS="$LIBS_SAVE_KWSL"
-+AC_LANG_RESTORE
-+
-+if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then
-+ SQLDIR=sql
-+ AC_SUBST(SQLDIR)
-+ AC_MSG_RESULT([QT supports SQL - compile qtsqlmailmerge])
-+else
-+ SQLDIR=
-+ AC_SUBST(SQLDIR)
-+ AC_MSG_RESULT([QT supports SQL -- qtsqlmailmerge will not be built])
++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
+
-+AM_CONDITIONAL(include_sql, test -n "$SQLDIR")
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/lib/configure.in.in
-+dnl =======================================================
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
++_ACEOF
+
-+AC_SUBST(KWMF_INCLUDES, '-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf')
-+AC_SUBST(KSTORE_INCLUDES, '-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store')
-+AC_SUBST(KOTEXT_INCLUDES, '-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext')
-+AC_SUBST(KOPAINTER_INCLUDES, '-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter')
-+AC_SUBST(KOPALETTE_INCLUDES, '-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette')
-+AC_SUBST(KOFFICECORE_INCLUDES, '-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore')
-+AC_SUBST(KOFFICEUI_INCLUDES, '-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui')
-+AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula')
-+dnl those are included with e.g. <koproperty/set.h>
-+AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib')
-+AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross')
-+AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la')
-+AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la')
-+AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la')
-+AC_SUBST(LIB_KOTEXT, '$(top_builddir)/lib/kotext/libkotext.la')
-+AC_SUBST(LIB_KOPAINTER, '$(top_builddir)/lib/kopainter/libkopainter.la')
-+AC_SUBST(LIB_KOPALETTE, '$(top_builddir)/lib/kopalette/libkopalette.la')
-+AC_SUBST(LIB_KWMF, '$(top_builddir)/lib/kwmf/libkwmf.la')
-+AC_SUBST(LIB_KOWMF, '$(top_builddir)/lib/kwmf/libkowmf.la')
-+AC_SUBST(LIB_KFORMULA, '$(top_builddir)/lib/kformula/libkformulalib.la')
-+AC_SUBST(LIB_KOPROPERTY, '$(top_builddir)/lib/koproperty/libkoproperty.la')
-+AC_SUBST(LIB_KROSS_API, '$(top_builddir)/lib/kross/api/libkrossapi.la')
-+AC_SUBST(LIB_KROSS_MAIN, '$(top_builddir)/lib/kross/main/libkrossmain.la')
+
-+AC_SUBST(interfacedir, '$(top_srcdir)/lib/interfaces')
-+AC_SUBST(KOFFICE_LIBS, '$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)')
-+AC_SUBST(KOFFICE_INCLUDES, '$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)')
-+
-+AC_DEFINE_UNQUOTED(PREFIX,"$prefix",[Define the PREFIX where to install this package])
-+
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/lib/kotext/configure.in.in
-+dnl =======================================================
-+
-+ AC_LANG_SAVE
-+ AC_LANG_C
-+ dnl Check for aspell library
-+ KDE_CHECK_HEADERS([kspell2/broker.h])
-+ if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then
-+ dnl the header and the lib exist -> ok
-+ dnl this is for config.h
-+ AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking])
-+ LIBKSPELL2="-lkspell2"
-+ AC_MSG_RESULT([found in $ac_kspell2_includes])
-+ else
-+ LIBKSPELL2=""
-+ AC_MSG_RESULT([not found -- spell-checking will be disabled])
-+ fi
-+ AC_SUBST(LIBKSPELL2)
-+ AC_LANG_RESTORE
-+dnl =======================================================
-+dnl FILE: ./koffice-1.5.1/lib/kross/configure.in.in
-+dnl =======================================================
-+
-+AC_ARG_ENABLE(scripting,
-+ AC_HELP_STRING([--enable-scripting],
-+ [build scripting library (Kross) [default=yes]]),
-+ compile_kross=$enableval, compile_kross=yes)
-+AM_CONDITIONAL(compile_kross, test "x$compile_kross" = "xyes")
-+
-+###############################
-+# Check if Python is installed.
-+
-+if test "x$compile_kross" = "xyes" ; then
-+ #KDE_CHECK_PYTHON(2.3)
-+ KDE_CHECK_PYTHON
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[ ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[ ]*$//
++}'
+fi
+
-+# Compile the Kross python plugin only if both, $LIBPYTHON and
-+# $PYTHONINC, are defined.
-+AM_CONDITIONAL(compile_kross_python,
-+ test -n "$LIBPYTHON" && test -n "$PYTHONINC")
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+- case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
++fi # test -n "$CONFIG_FILES"
+
-+###############################
-+# Check for Ruby
+
-+if test "x$compile_kross" = "xyes" ; then
-+ AC_CHECK_PROG(RUBY, ruby, ruby)
++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
++do
++ case $ac_tag in
++ :[FHLC]) ac_mode=$ac_tag; continue;;
++ esac
++ case $ac_mode$ac_tag in
++ :[FHL]*:*);;
++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++ { (exit 1); exit 1; }; };;
++ :[FH]-) ac_tag=-:-;;
++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++ esac
++ ac_save_IFS=$IFS
++ IFS=:
++ set x $ac_tag
++ IFS=$ac_save_IFS
++ shift
++ ac_file=$1
++ shift
+
-+ if test -n "$RUBY"; then
-+ AC_MSG_CHECKING(for Ruby dirs)
-+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
-+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-+ RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
-+ AC_MSG_RESULT([
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ libdir $RUBY_LIBDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ rubysharedenabled $RUBY_ENABLESHARED])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_ENABLESHARED)
++ case $ac_mode in
++ :L) ac_source=$1;;
++ :[FH])
++ ac_file_inputs=
++ for ac_f
++ do
++ case $ac_f in
++ -) ac_f="$tmp/stdin";;
++ *) # Look for the file first in the build tree, then in the source tree
++ # (if the path is not absolute). The absolute path cannot be DOS-style,
++ # because $ac_f cannot contain `:'.
++ test -f "$ac_f" ||
++ case $ac_f in
++ [\\/$]*) false;;
++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++ esac ||
++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++ { (exit 1); exit 1; }; };;
++ esac
++ ac_file_inputs="$ac_file_inputs $ac_f"
++ done
+
-+ AC_MSG_CHECKING(for Ruby header)
-+
-+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-+ # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR
-+ RUBY_INCLUDEDIR=$RUBY_ARCHDIR
++ # Let's still pretend it is `configure' which instantiates (i.e., don't
++ # use $as_me), people would be surprised to read:
++ # /* config.h. Generated by config.status. */
++ configure_input="Generated from "`IFS=:
++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++ if test x"$ac_file" != x-; then
++ configure_input="$ac_file. $configure_input"
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
+ fi
+
-+ if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-+ RUBY_LIBDIR=""
-+ AC_MSG_RESULT([not found])
-+ else
-+ AC_MSG_RESULT([found]) # header
++ case $ac_tag in
++ *:-:* | *:-) cat >"$tmp/stdin";;
++ esac
++ ;;
+ esac
+
+- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++ ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ { as_dir="$ac_dir"
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
+ done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+-
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+
++ case $ac_mode in
++ :F)
++ #
++ # CONFIG_FILE
++ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
++_ACEOF
+
+- # Let's still pretend it is `configure' which instantiates (i.e., don't
+- # use $as_me), people would be surprised to read:
+- # /* config.h. Generated by config.status. */
+- if test x"$ac_file" = x-; then
+- configure_input=
+- else
+- configure_input="$ac_file. "
+- fi
+- configure_input=$configure_input"Generated from `echo $ac_file_in |
+- sed 's,.*/,,'` by configure."
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
++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_seen=
+
-+ AC_MSG_CHECKING(Ruby shared library)
-+ if test "x$RUBY_ENABLESHARED" != "xyes" ; then
-+ AC_MSG_RESULT([shared library not found])
-+ RUBY_LIBDIR=""
-+ else
-+ if test -z "$RUBY_LIBRUBYARG" ; then
-+ AC_MSG_RESULT([link argument not found])
-+ RUBY_LIBDIR=""
-+ else
-+ AC_MSG_RESULT([found]) # shared library link arg
++case `sed -n '/datarootdir/ {
++ p
++ q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*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;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++ ac_datarootdir_hack='
++ s&@datadir@&$datadir&g
++ s&@docdir@&$docdir&g
++ s&@infodir@&$infodir&g
++ s&@localedir@&$localedir&g
++ s&@mandir@&$mandir&g
++ s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
+ _ACEOF
+
-+ AC_MSG_CHECKING([if C++ program with ruby can be compiled])
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -I$RUBY_INCLUDEDIR"
-+ AC_CACHE_VAL(ruby_build,
-+ [
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ #include <version.h>
-+ ],[
-+
-+#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
-+#error "need at least ruby 1.8.2\n"
-+#endif
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+ $extrasub
+@@ -60957,248 +67033,129 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+- rm -f $tmp/stdin
+- if test x"$ac_file" != x-; then
+- mv $tmp/out $ac_file
+- else
+- cat $tmp/out
+- rm -f $tmp/out
+- fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
+
-+ ruby_init();
-+ return 0;
-+ ], ruby_build=yes,
-+ ruby_build=no)
-+ ])
-+ AC_MSG_RESULT($ruby_build)
-+ if test "$ruby_build" = "no"; then
-+ RUBY_LIBDIR=""
-+ fi
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ fi # have ruby shared lib argument
-+ fi # have shared lib
-+ fi # have ruby header
-+ fi # have ruby
-+fi # compiling kross
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$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;}
+
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++ rm -f "$tmp/stdin"
+ case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
+-
+- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- # Do quote $f, to prevent DOS paths from being IFS'd.
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
+- # Remove the trailing spaces.
+- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+-
++ ;;
++ :H)
++ #
++ # CONFIG_HEADER
++ #
+ _ACEOF
+
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h. The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status. Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless. Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
+
+-# This sed command replaces #undef with comments. This is necessary, for
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
++ s/[\\&,]/\\&/g
++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++ ' >>conftest.defines
+
-+AM_CONDITIONAL(compile_kross_ruby, test -n "$RUBY_LIBDIR")
-+dnl =======================================================
-+dnl FILE: ./krita/configure.in.in
-+dnl =======================================================
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments. This is necessary, for
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+-_ACEOF
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[ #]*u.*,/* & */,' >>conftest.defines
+
-+KDE_CHECK_LIB(Xi, XOpenDisplay, [
-+ LIB_XINPUTEXT="-lXi"
-+ AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension])
-+ ])
-+AC_SUBST(LIB_XINPUTEXT)
++# Break up conftest.defines:
++ac_max_sed_lines=50
+
-+# Check for lcms
-+AC_MSG_CHECKING([for lcms >= 1.12])
-+
-+have_lcms_header='no'
-+KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
-+if test "$have_lcms_header" = 'yes'
-+then
-+ AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header])
-+
-+ echo "#include <lcms/lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
-+
-+else
-+ # Alternative! Debian does it this way...
-+ KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
-+
-+ AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
-+
-+ echo "#include <lcms.h>" > conftest.$ac_ext
-+ echo "#if LCMS_VERSION < 112" >> conftest.$ac_ext
-+ echo "#error Need lcms >= 1.12" >> conftest.$ac_ext
-+ echo "#endif" >> conftest.$ac_ext
-+ echo "int main() {}" >> conftest.$ac_ext
-+fi
-+
-+
-+ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext -llcms 1>&5'
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+ AC_MSG_RESULT(yes)
-+ HAVELCMS="yes"
-+ LCMS_LIBS="-llcms"
-+else
-+ AC_MSG_RESULT(no)
-+ HAVELCMS="no"
-+ LCMS_LIBS=""
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
-+fi
-+
-+AC_SUBST(LCMS_LIBS)
-+
-+# Check if the 1.14 version of lcms is detected
-+if test ! "$LCMS_LIBS" = ""
-+then
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+AC_TRY_COMPILE(
-+ [#include LCMS_HEADER
-+ #if LCMS_VERSION == 114
-+ #error lcms 1.14 detected
-+ #endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
-+AC_LANG_RESTORE
-+fi
-+
-+# IM 6.1.3 changed the number of arguments to GetMagickInfoList
-+
-+AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments)
-+CPPFLAGS_TMP="$CPPFLAGS" # Save preprocessor flags
-+CPPFLAGS="$LIBMAGICK_CPPFLAGS"
-+
-+AC_TRY_COMPILE(
-+ [#include <stdio.h>
-+ #if HAVE_SYS_TYPES_H
-+ #include <sys/types.h>
-+ #endif
-+ #include "magick/api.h"],
-+ [const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)],
-+ magick_info_list='yes',
-+ magick_info_list='no')
-+
-+CPPFLAGS="$CPPFLAGS_TMP" # Restore preprocessor flags
-+
-+if test "$magick_info_list" = 'yes'; then
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3])
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
-+# Check for kunittest
-+AC_MSG_CHECKING([for kunittest])
-+
-+have_kunittest_header="no"
-+KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
-+AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes")
-+
-+# --- OpenGL check ---
-+
-+AC_HAVE_GL( [], [] )
-+
-+# --- End of OpenGL check ---
-+
-+# Check for powf.
-+
-+AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])])
-+
-+if test "$have_powf" = 'yes'; then
-+ AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in <maths.h>])
-+fi
-+dnl =======================================================
-+dnl FILE: ./krita/plugins/configure.in.in
-+dnl =======================================================
-+
-+KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no)
-+AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes)
-+dnl =======================================================
-+dnl FILE: ./krita/plugins/viewplugins/imagesize/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_DECLS([round], [], [], [#include <math.h>])
-+dnl =======================================================
-+dnl FILE: ./kspread/plugins/calculator/configure.in.in
-+dnl =======================================================
-+
-+AC_CHECK_HEADERS(ieeefp.h)
-+
-+AC_CHECK_FUNCS(fabsl)
++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
- AC_DEFUN([KDE_C_LONG_DOUBLE],
- [
-@@ -1557,6 +3047,10 @@
- AM_CONDITIONAL(kdgantt_SUBDIR_included, test "x$kdgantt_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kformula_SUBDIR_included, test "x$kformula_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kivio_SUBDIR_included, test "x$kivio_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(koffice_1_5_1_SUBDIR_included, test "x$koffice_1_5_1_SUBDIR_included" = xyes)
-+if test "x$koffice_1_5_1_SUBDIR_included" = xyes; then
-+ AC_CONFIG_SUBDIRS(koffice-1.5.1)
-+fi
- AM_CONDITIONAL(koshell_SUBDIR_included, test "x$koshell_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kounavail_SUBDIR_included, test "x$kounavail_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kpresenter_SUBDIR_included, test "x$kpresenter_SUBDIR_included" = xyes)
-@@ -2157,7 +3651,146 @@
- esac
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo ' :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+- # Write a limited-size here document to $tmp/defines.sed.
+- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#define' lines.
+- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++while :
++do
++ # Write a here document:
++ cat >>$CONFIG_STATUS <<_ACEOF
++ # First, check the format of the line:
++ cat >"\$tmp/defines.sed" <<\\CEOF
++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
++b
++:def
++_ACEOF
++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+- sed -f $tmp/defines.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
done
+-rm -f conftest.defines
+-echo ' fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+- # Write a limited-size here document to $tmp/undefs.sed.
+- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#undef'
+- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+- echo 'CEOF
+- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+- rm -f conftest.undefs
+- mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
++rm -f conftest.defines conftest.tail
--AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR")
-+AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR")
-+AC_MSG_CHECKING([for filters to be compiled])
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
+ cat >>$CONFIG_STATUS <<\_ACEOF
+- # Let's still pretend it is `configure' which instantiates (i.e., don't
+- # use $as_me), people would be surprised to read:
+- # /* config.h. Generated by config.status. */
+- if test x"$ac_file" = x-; then
+- echo "/* Generated by configure. */" >$tmp/config.h
+- else
+- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
+- fi
+- cat $tmp/in >>$tmp/config.h
+- rm -f $tmp/in
+ if test x"$ac_file" != x-; then
+- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++ echo "/* $configure_input */" >"$tmp/config.h"
++ cat "$ac_result" >>"$tmp/config.h"
++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_file" : 'X\(//\)[^/]' \| \
+- X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
+ rm -f $ac_file
+- mv $tmp/config.h $ac_file
++ mv "$tmp/config.h" $ac_file
+ fi
+ else
+- cat $tmp/config.h
+- rm -f $tmp/config.h
++ echo "/* $configure_input */"
++ cat "$ac_result"
+ fi
++ rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -61209,135 +67166,39 @@
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+ echo X$ac_file |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_dest" : 'X\(//\)[^/]' \| \
+- X"$ac_dest" : 'X\(//\)$' \| \
+- X"$ac_dest" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
+- ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+- .) # No --srcdir option. We are building in place.
+- ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++ esac
+
+
+- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+- case $ac_dest in
+- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++ case $ac_file$ac_mode in
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+@@ -61347,18 +67208,29 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+- dirpart=`(dirname "$mf") 2>/dev/null ||
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+- X"$mf" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$mf" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ else
+ continue
+ fi
+@@ -61380,53 +67252,79 @@
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+- fdir=`(dirname "$file") 2>/dev/null ||
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+- X"$file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ { as_dir=$dirpart/$fdir
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
+ done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+-
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+ ;;
+
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
+ esac
+-done
+-_ACEOF
++done # for ac_tag
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
+
+ { (exit 0); exit 0; }
+ _ACEOF
+--- configure.in
++++ configure.in
+@@ -42,6 +42,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(koffice, "1.5.2") dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
-+
-+# first check which main apllication we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ kword) COMPILE_FILTER_KWORD="$args " ;;
-+ kspread) COMPILE_FILTER_KSPREAD="$args " ;;
-+ kchart) COMPILE_FILTER_KCHART="$args " ;;
-+ karbon) COMPILE_FILTER_KARBON="$args " ;;
-+ kpresenter) COMPILE_FILTER_KPRESENTER="$args " ;;
-+ kformula) COMPILE_FILTER_KFORMULA="$args " ;;
-+ kugar) COMPILE_FILTER_KUGAR="$args " ;;
-+ krita) COMPILE_FILTER_KRITA="$args " ;;
-+ kivio) COMPILE_FILTER_KIVIO="$args " ;;
-+ esac
-+done
-+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ kword) COMPILE_FILTER_KWORD= ;;
-+ kspread) COMPILE_FILTER_KSPREAD= ;;
-+ kchart) COMPILE_FILTER_KCHART= ;;
-+ karbon) COMPILE_FILTER_KARBON= ;;
-+ kpresenter) COMPILE_FILTER_KPRESENTER= ;;
-+ kformula) COMPILE_FILTER_KFORMULA= ;;
-+ kugar) COMPILE_FILTER_KUGAR= ;;
-+ krita) COMPILE_FILTER_KRITA= ;;
-+ kivio) COMPILE_FILTER_KIVIO= ;;
-+ esac
-+done
-+
-+USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR"
-+AC_MSG_RESULT([$USERFEEDBACKCOMPILE])
-+
-+AM_CONDITIONAL(compile_filter_KWORD, test -n "$COMPILE_FILTER_KWORD")
-+AM_CONDITIONAL(compile_filter_KSPREAD, test -n "$COMPILE_FILTER_KSPREAD")
-+AM_CONDITIONAL(compile_filter_KCHART, test -n "$COMPILE_FILTER_KCHART")
-+AM_CONDITIONAL(compile_filter_KARBON, test -n "$COMPILE_FILTER_KARBON")
-+AM_CONDITIONAL(compile_filter_KPRESENTER, test -n "$COMPILE_FILTER_KPRESENTER")
-+AM_CONDITIONAL(compile_filter_KFORMULA, test -n "$COMPILE_FILTER_KFORMULA")
-+AM_CONDITIONAL(compile_filter_KUGAR, test -n "$COMPILE_FILTER_KUGAR")
-+AM_CONDITIONAL(compile_filter_KRITA, test -n "$COMPILE_FILTER_KRITA")
-+AM_CONDITIONAL(compile_filter_KIVIO, test -n "$COMPILE_FILTER_KIVIO")
-+
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
-+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
-+
-+# first check which main apllication we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ kugar) COMPILE_PLUGIN_KUGAR="$args " ;;
-+ esac
-+done
-+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ kugar) COMPILE_PLUGIN_KUGAR= ;;
-+ esac
-+done
-+
-+AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR")
-+if test -s $srcdir/inst-apps ; then
-+ SUBDIRLIST=`cat $srcdir/inst-apps`
-+else
-+ SUBDIRLIST=`cat $srcdir/subdirs`
-+fi
-+
-+# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
-+if test -z "$SUBDIRLIST" ; then
-+ SUBDIRLIST=`ls -1 $srcdir`
-+fi
-+
-+AC_MSG_CHECKING([whether only Kexi is being built])
-+KEXI_ONLY=yes
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ lib) ;;
-+ kexi) ;;
-+ *) if test -d $srcdir/$args ; then
-+ KEXI_ONLY=no
-+ fi
-+ ;;
-+ esac
-+done
-+AC_MSG_RESULT([$KEXI_ONLY])
-+AM_CONDITIONAL(compile_kexionly, test "$KEXI_ONLY" = "yes" )
-+
-+AC_MSG_CHECKING([whether kopainter should be compiled])
-+
-+
-+# first check which main application we could compile
-+for args in $SUBDIRLIST ; do
-+ case $args in
-+ krita) COMPILE_LIB_FOR_KRITA="$args " ;;
-+ karbon) COMPILE_LIB_FOR_KARBON="$args " ;;
-+ kivio) COMPILE_LIB_FOR_KIVIO="$args " ;;
-+ esac
-+done
-+
-+# now remove the applications the user has asked not to compile
-+for args in $DO_NOT_COMPILE ; do
-+ case $args in
-+ krita) COMPILE_LIB_FOR_KRITA= ;;
-+ karbon) COMPILE_LIB_FOR_KARBON= ;;
-+ kivio) COMPILE_LIB_FOR_KIVIO= ;;
-+ esac
-+done
-+
-+if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO" ; then
-+ USERFEEDBACKCOMPILELIB="yes"
-+else
-+ USERFEEDBACKCOMPILELIB="no"
-+fi
-+
-+AC_MSG_RESULT([$USERFEEDBACKCOMPILELIB])
-+
-+AM_CONDITIONAL(compile_lib_KOPAINTER, test "$USERFEEDBACKCOMPILELIB" = "yes" )
-+
- if test -s $srcdir/inst-apps ; then
- SUBDIRLIST=`cat $srcdir/inst-apps`
- else
-@@ -2420,6 +4053,261 @@
- all_tests=bad
- echo "----------------------------------------------------------------------"
- fi
-+if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then
-+ echo ""
-+ echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)."
-+ echo "krita won't be able to import/export jpeg"
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBMAGICK_LIBS"; then
-+ echo ""
-+ echo "You're missing ImageMagick (>=6.1.0). krita's ImageMagick import/export"
-+ echo "filter will not be compiled. You can download ImageMagick from"
-+ echo "http://www.imagemagick.org/. The ImageMagick filter allows krita to"
-+ echo "read and write XCF, PSD, GIF, BMP, and many other image formats."
-+ echo ""
-+ echo "If you have problems compiling ImageMagick, please try configuring it using"
-+ echo "the --without-magick-plus-plus flag, the C++ API isn't needed for krita."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$OPENEXR_LIBS"; then
-+ echo ""
-+ echo "You're missing the OpenEXR library. Krita's OpenEXR import/export filter will "
-+ echo "not be compiled. You can download OpenEXR from http://www.openexr.com or "
-+ echo "install it from an appropriate binary package."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBPNG"; then
-+ echo ""
-+ echo "You're missing libpng (binaries and/or headers), krita won't be able"
-+ echo "to import/export png"
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBTIFF"; then
-+ echo ""
-+ echo "You're missing libtiff (binaries and/or headers), krita won't be able"
-+ echo "to import/export tiff"
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBWV2_LIBS"; then
-+ echo ""
-+ echo "You're missing libwv2 0.1.9 or newer. KWord's MS Word filter will not be"
-+ echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge"
-+ echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a"
-+ echo "tarball at http://sourceforge.net/projects/wvware/"
-+# echo "The MS Word filter won't be compiled due to experimental changes."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBWPD_LIBS"; then
-+ echo ""
-+ echo "You're missing libwpd 0.8 or newer. KWord's WordPerfect import filter will "
-+ echo "not be compiled. You can download libwpd from http://libwpd.sf.net or "
-+ echo "install it from appropriate binary package."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$LIBXML_LIBS"; then
-+ echo ""
-+ echo "You're missing libxml2 (at least version 2.4.8)."
-+ echo "The XSLT filters will not be compiled."
-+ echo "Please download libxml2 from http://xmlsoft.org ."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBXSLT_LIBS"; then
-+ echo ""
-+ echo "You're missing libxslt (at least version 1.0.7)."
-+ echo "The XSLT filters will not be compiled."
-+# TODO: URL is not exacly right anymore
-+ echo "Please download libxml2 from http://xmlsoft.org ."
-+ echo ""
-+ all_tests=bad
-+fi
-+
-+if test -z "$LIBART_LIBS"; then
-+ echo ""
-+ echo "You're missing libart 2.3.8. karbon will not be compiled."
-+ echo "You can download libart from"
-+ echo "http://svg.kde.org/download.html"
-+ echo ""
-+ all_tests=bad
-+else
-+ if test -z "$LIBFONTCONFIG_LIBS"; then
-+ echo ""
-+ echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text support."
-+ echo "You can download fontconfig from http://fontconfig.org/"
-+ echo ""
-+ all_tests=bad
-+ fi
-+
-+ if test -z "$LIBFREETYPE_LIBS"; then
-+ echo ""
-+ echo "You're missing libfreetype 5.0 or newer. karbon will not have text support."
-+ echo "You can download libfreetype from http://www.freetype.org/"
-+ echo ""
-+ all_tests=bad
-+ fi
-+fi
-+if test -z "$MYSQL_INC" -o -z "$MYSQL_LIBS"; then
-+
-+ echo "----------------------------------------------------------------------"
-+
-+ echo " + The MySQL development files were not found."
-+ cat <<EOS
-+ These are required for MySQL support in Kexi.
-+
-+ If you want MySQL support in Kexi, you need to install the MySQL development
-+ files, ensure that mysql-config is in your path, and run this configure script
-+ again, and finally run make; make install.
-+ If you don't need MySQL support, you can simply run make; make install now.
-+EOS
-+ all_tests=bad
-+fi
-+
-+if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" -o \
-+ -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then
-+
-+ echo "----------------------------------------------------------------------"
-+
-+# LIBPQ messages
-+ if test -z "$PG_INCDIR"; then
-+ echo " + The PostgreSQL C-API (libpq) headers were not found."
-+ fi
-+
-+ if test -z "$PG_LIBDIR"; then
-+ echo " + The PostgreSQL C-API (libpq) libraries were not found."
-+ fi
-+
-+ if test -z "$PG_INCDIR" -a -z "$PG_LIBDIR" ; then
-+ pglib_parts_missing="HEADER or the libpq LIBRARY"
-+ elif test -z "$PG_INCDIR" ; then
-+ pglib_parts_missing="HEADER"
-+ elif test -z "$PG_LIBDIR" ; then
-+ pglib_parts_missing="LIBRARY"
-+ fi
-+
-+ if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" ; then
-+ cat <<EOS
-+ Could not find the libpq $pglib_parts_missing files.
-+ These are required by the libpqxx C++ library, which is used by
-+ Kexi's PostgreSQL drivers.
-+
-+ The PostgreSQL C-API usually ship with PostgreSQL, but if you've
-+ installed from a distros package then these files may be part of
-+ a package called postgresql-devel or libpq-devel"
-+
-+EOS
-+ fi
-+
-+# LIBPQXX messages
-+ if test -z "$PQXX_INCDIR"; then
-+ echo " + The PostgreSQL C++ API (libpqxx) headers were not found."
-+ fi
-+
-+ if test -z "$PQXX_LIBDIR"; then
-+ echo " + The PostgreSQL C++ API (libpqxx) shared libraries were not found."
-+ fi
-+
-+ if test -z "$PQXX_INCDIR" -a -z "$PQXX_LIBDIR" ; then
-+ pqxx_parts_missing="HEADER or the libpqxx LIBRARY"
-+ elif test -z "$PQXX_INCDIR" ; then
-+ pqxx_parts_missing="HEADER"
-+ elif test -z "$PQXX_LIBDIR" ; then
-+ pqxx_parts_missing="LIBRARY"
-+ fi
-+
-+ if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR" ; then
-+ cat <<EOS
-+ Could not find the libpqxx $pqxx_parts_missing files.
-+ These are required by Kexi's PostgreSQL drivers.
-+
-+ Note: Kexi requires the SHARED libpqxx.so library files.
-+ If you build pqxx library on your own, don't forget to use the
-+ --enable-shared option when you run libpqxx's configure script.
-+ This is necessary to compile the SHARED .so library, and
-+ not the STATIC libpqxx.a.
-+
-+ The PostgreSQL C++ API can be downloaded from pqxx.tk or
-+ http://gborg.postgresql.org/project/libpqxx/projdisplay.php
-+ Grab the latest version (>=2)
-+
-+EOS
-+ fi
-+
-+# SUMMARY messages
-+ cat <<EOS
-+ These warnings are not critical, but without installing the files
-+ listed above Kexi will be compiled without PostgreSQL support.
-+
-+ If you want PostgreSQL support in Kexi, you need to install the files
-+ listed above, then run this configure script again, and finally run
-+ make; make install. If you don't, simply run make; make install now.
-+EOS
-+
-+ all_tests=bad
-+ echo "----------------------------------------------------------------------"
-+fi
-+if test -z "$LCMS_LIBS"; then
-+ echo ""
-+ echo "LittleCMS is missing, Krita will not be built."
-+ echo ""
-+ echo "If you want to compile Krita you should install:"
-+ echo " * lcms 1.12 or newer (http://www.littlecms.com/)"
-+ echo " and avoid 1.14 as it has a major bugs in CMYK"
-+ echo ""
-+ all_tests=bad
-+else
-+ if test "$lcms_version_114" = 'yes'; then
-+ echo "=============================================="
-+ echo "WARNING: you are using version 1.14 of lcms"
-+ echo " this version has a bug that break filling"
-+ echo " and select similar colors in at least CMYK"
-+ echo " you might want to use a newer version, or"
-+ echo " an older"
-+ echo "=============================================="
-+ fi
-+ if test -z "$GLLIB"; then
-+ echo ""
-+ echo "You're missing OpenGL libraries. krita will"
-+ echo "not be able to use OpenGL for hardware"
-+ echo "accelerated rendering."
-+ echo ""
-+ fi
-+fi
-+
-+
-+if test -z "$LIBKSPELL2"; then
-+ echo ""
-+ echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled."
-+ echo ""
-+ all_tests=bad
-+fi
-+if test -z "$RUBY_LIBDIR" -a "x$compile_kross" = "xyes" ; then
-+ echo ""
-+ echo "Ruby development files were not found, or Ruby <= 1.8.1 was found,"
-+ echo "Ruby scripting support for KOffice will not be built. If you don't"
-+ echo "need Ruby scripting, you can ignore this message."
-+ echo ""
-+fi
-+
-+if test -z "$LIBPYTHON" -a -z "$PYTHONINC" -a $"x$compile_kross" = "xyes"; then
-+ echo ""
-+ echo "Python developement files were not found, Python scripting support for"
-+ echo "KOffice will not be built. If you don't need Python scripting, you"
-+ echo "can ignore this message"
-+ echo ""
-+fi
-+
- if test -z "$LCMS_LIBS"; then
- echo ""
- echo "LittleCMS is missing, Krita will not be built."
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+@@ -431,7 +433,8 @@
+ vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test -n "$vers" && test "$vers" -ge 1009
+ then
+- LIBWV2_LIBS="`$WV2_CONFIG --libs`"
++ #LIBWV2_LIBS="`$WV2_CONFIG --libs`"
++ LIBWV2_LIBS="-lwv2"
+ LIBWV2_RPATH=
+ for args in $LIBWV2_LIBS; do
+ case $args in
--- doc/karbon/Makefile.in
+++ doc/karbon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69220,24 +62287,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69246,7 +62359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69260,13 +62373,15 @@
mostlyclean-libtool:
--- doc/kchart/Makefile.in
+++ doc/kchart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69276,24 +62391,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69302,7 +62463,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69316,13 +62477,15 @@
mostlyclean-libtool:
--- doc/kexi/Makefile.in
+++ doc/kexi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69332,24 +62495,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69358,7 +62567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69372,13 +62581,15 @@
mostlyclean-libtool:
--- doc/kformula/Makefile.in
+++ doc/kformula/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69388,24 +62599,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69414,7 +62671,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69428,13 +62685,15 @@
mostlyclean-libtool:
--- doc/kivio/Makefile.in
+++ doc/kivio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69444,24 +62703,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69470,7 +62775,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69484,13 +62789,15 @@
mostlyclean-libtool:
--- doc/koffice/Makefile.in
+++ doc/koffice/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69500,24 +62807,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69526,7 +62879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69540,13 +62893,15 @@
mostlyclean-libtool:
--- doc/koshell/Makefile.in
+++ doc/koshell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69556,24 +62911,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69582,7 +62983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69596,13 +62997,15 @@
mostlyclean-libtool:
--- doc/kplato/Makefile.in
+++ doc/kplato/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69612,24 +63015,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69638,7 +63087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69652,13 +63101,15 @@
mostlyclean-libtool:
--- doc/kpresenter/Makefile.in
+++ doc/kpresenter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69668,24 +63119,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69694,7 +63191,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69708,13 +63205,15 @@
mostlyclean-libtool:
--- doc/krita/Makefile.in
+++ doc/krita/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69724,24 +63223,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69750,7 +63295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69762,48 +63307,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -708,7 +714,7 @@
- KDE_DIST=dialogs-colorrange.png crocusses-sobel.png crocusses-topedge.png tutorial-quick-starts12.png palettes-controlbox-contiguousfill.png dialogs-customconvolution.png using-selections-5.png settings.docbook tutorial-quick-starts6.png using-selections-2.png developers.docbook toolbar-brushes-patterns-custompattern.png palettes-layers-layers.png tool-polygon.png palettes-controlbox-rectangle.png index.docbook dialogs-convertlayertype.png dialogs-emboss.png palettes-colors-rgb.png palettes-controlbox-polygon.png commands-palettes.docbook crocusses-bumpmap.png tool-selectoutline.png tutorial-select-layer-1.png toolbar-brushes-patterns.png dialogs-imagesize.png dialogs-bumpmap.png preferences-performance.png tool-duplicate.png palettes-controlbox-paintwithfilters.png tool-text.png tool-brush.png tutorial-select-layer-9.png dialogs-convertimagetype.png palettes-layers-scriptsmanager.png dialogs-roundcorners.png crocusses-edgeright.png preferences-color.png dialogs-layerproperties.png dialogs-imagerestoration.png palettes-colors-palettes.png tool-line.png tool-pan.png tool-paintselection.png palettes-controlbox-transform.png crocusses-sharpen.png faq.docbook crocusses-raindrops.png tool-move.png palettes-controlbox-select.png dialogs-dropshadow.png tool-selectelliptical.png toolbar-file.png crocusses.png palettes-controlbox-selectcontiguous.png tool-selectrectangular.png toolbar-edit.png palettes-controlbox-star.png tutorial-select-layer-13.png tutorial-select-layer-7.png preferences-sidebar.png tutorial-quick-starts5.png using-filters.docbook tutorial-select-layer-5.png toolbar-brushesandstuff.png crocusses-edgebottom.png palettes-controlbox-overview.png palettes-controlbox-brush.png dialogs-shearimage.png palettes-controlbox-selectsimilar.png toolbar-krita.png crocusses-embossvariable.png toolbar-transformationtools.png palettes-colors-hsv.png Makefile.in dialogs-histogram.png tutorial-select-layer-3.png commands-menus.docbook introduction.docbook crocusses-tiles.png tutorial-quick-starts1.png dialogs-documentinformation.png using-selections-4.png crocusses-invert.png crocusses-embosshorvert.png newimage.png palettes-controlbox-text.png using-selections.docbook tutorial-select-layer-sample.png palettes-colors-watercolors.png installation.docbook tutorial-select-layer-10.png dialogs-coloradjustment.png tool-rectangle.png dialogs-cubism.png toolbar-brushes-brushshapes-predefined.png crocusses-edgeleft.png dialogs-addpalette.png crocusses-embossall.png using-layers.docbook tool-transform.png preferences-grid.png crocusses-roundcorners.png tutorial-select-layer-4.png dialogs-filtersgallery.png tool-selectpolygonal.png dialogs-newlayer.png tool-star.png tutorial-quick-starts10.png dialogs-brightnesscontrast.png using-selections-3.png commands-dialogs.docbook palettes-controlbox-histogram.png dialogs-rotateimage.png tutorial-select-layer-2.png scripting.docbook tutorial-quick-starts8.png dialogs-pixelize.png tutorial-quick-starts.docbook tool-ellipse.png credits.docbook crocusses-simplenoise.png dialogs-layersize.png dialogs-shearlayer.png tutorial.docbook tool-contiguousfill.png commands.docbook palettes-controlbox-line.png tutorial-quick-starts3.png tutorial-select-layer-12.png crocusses-pixelize.png dialogs-rotatelayer.png preferences-general.png commands-toolbars.docbook toolbar-brushes-gradients.png tool-eraseselection.png dialogs-oilpaint.png index.cache.bz2 toolbar-navigation.png tutorial-select-layer-6.png using-selections-1.png using-selections-6.png tutorial-select-layer-8.png tutorial-quick-starts9.png palettes-controlbox-crop.png tutorial-quick-starts2.png palettes-colors-gray.png tutorial-quick-starts7.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-gradient.png tool-colorpicker.png dialogs-separateimage.png dialogs-newadjustmentlayer.png using-colorspaces.docbook dialogs-sobel.png palettes-controlbox-colorpicker.png tool-zoom.png crocusses-oilpaint.png tutorial-quick-starts11.png tool-selectsimilar.png tutorial-starting.docbook dialogs-smalltiles.png preferences-display.png preferences-tablet.png tool-selectcontiguous.png crocusses-gaussianblur.png dialogs-imageproperties.png tool-paintwithfilters.png dialogs-raindrops.png tutorial-select-layer.docbook tool-gradient.png toolbar-brushes-brushshapes-autobrush.png tutorial-select-layer-11.png tool-crop.png mainscreen.png crocusses-meanremoval.png tutorial-quick-starts4.png tool-polyline.png createdocument.png Makefile.am
+@@ -706,7 +715,7 @@
+ KDE_DIST=dialogs-colorrange.png crocusses-sobel.png crocusses-topedge.png tutorial-quick-starts12.png palettes-controlbox-contiguousfill.png dialogs-customconvolution.png using-selections-5.png settings.docbook tutorial-quick-starts6.png using-selections-2.png developers.docbook toolbar-brushes-patterns-custompattern.png tool-polygon.png palettes-layers-layers.png palettes-controlbox-rectangle.png index.docbook dialogs-convertlayertype.png dialogs-emboss.png palettes-colors-rgb.png palettes-controlbox-polygon.png tutorial-select-layer-1.png crocusses-bumpmap.png tool-selectoutline.png commands-palettes.docbook toolbar-brushes-patterns.png dialogs-imagesize.png dialogs-bumpmap.png preferences-performance.png tool-duplicate.png palettes-controlbox-paintwithfilters.png tool-text.png tutorial-select-layer-9.png tool-brush.png dialogs-roundcorners.png palettes-layers-scriptsmanager.png dialogs-convertimagetype.png crocusses-edgeright.png dialogs-layerproperties.png preferences-color.png dialogs-imagerestoration.png palettes-colors-palettes.png tool-pan.png tool-line.png tool-paintselection.png palettes-controlbox-transform.png crocusses-sharpen.png faq.docbook crocusses-raindrops.png tool-move.png dialogs-dropshadow.png palettes-controlbox-select.png tool-selectelliptical.png toolbar-file.png crocusses.png palettes-controlbox-selectcontiguous.png tool-selectrectangular.png toolbar-edit.png palettes-controlbox-star.png tutorial-select-layer-7.png tutorial-select-layer-13.png preferences-sidebar.png tutorial-quick-starts5.png using-filters.docbook tutorial-select-layer-5.png toolbar-brushesandstuff.png palettes-controlbox-brush.png crocusses-edgebottom.png palettes-controlbox-overview.png dialogs-shearimage.png palettes-controlbox-selectsimilar.png crocusses-embossvariable.png toolbar-krita.png toolbar-transformationtools.png Makefile.in palettes-colors-hsv.png tutorial-select-layer-3.png dialogs-histogram.png commands-menus.docbook crocusses-tiles.png introduction.docbook tutorial-quick-starts1.png dialogs-documentinformation.png using-selections-4.png crocusses-invert.png crocusses-embosshorvert.png newimage.png palettes-controlbox-text.png using-selections.docbook tutorial-select-layer-sample.png installation.docbook palettes-colors-watercolors.png tool-rectangle.png dialogs-coloradjustment.png tutorial-select-layer-10.png dialogs-cubism.png toolbar-brushes-brushshapes-predefined.png crocusses-edgeleft.png dialogs-addpalette.png crocusses-embossall.png tool-transform.png preferences-grid.png using-layers.docbook crocusses-roundcorners.png tutorial-select-layer-4.png dialogs-filtersgallery.png tool-selectpolygonal.png dialogs-newlayer.png tool-star.png tutorial-quick-starts10.png dialogs-brightnesscontrast.png using-selections-3.png commands-dialogs.docbook palettes-controlbox-histogram.png dialogs-rotateimage.png tutorial-select-layer-2.png scripting.docbook tutorial-quick-starts8.png dialogs-pixelize.png tutorial-quick-starts.docbook tool-ellipse.png credits.docbook crocusses-simplenoise.png dialogs-layersize.png dialogs-shearlayer.png tutorial.docbook commands.docbook tool-contiguousfill.png palettes-controlbox-line.png tutorial-quick-starts3.png crocusses-pixelize.png tutorial-select-layer-12.png dialogs-rotatelayer.png commands-toolbars.docbook preferences-general.png toolbar-brushes-gradients.png tool-eraseselection.png dialogs-oilpaint.png index.cache.bz2 toolbar-navigation.png tutorial-select-layer-6.png using-selections-1.png using-selections-6.png tutorial-select-layer-8.png tutorial-quick-starts9.png palettes-controlbox-crop.png tutorial-quick-starts2.png tutorial-quick-starts7.png palettes-colors-gray.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-gradient.png tool-colorpicker.png dialogs-separateimage.png using-colorspaces.docbook dialogs-newadjustmentlayer.png dialogs-sobel.png palettes-controlbox-colorpicker.png tool-zoom.png crocusses-oilpaint.png tutorial-quick-starts11.png tool-selectsimilar.png tutorial-starting.docbook dialogs-smalltiles.png preferences-display.png preferences-tablet.png tool-selectcontiguous.png crocusses-gaussianblur.png dialogs-imageproperties.png dialogs-raindrops.png tool-paintwithfilters.png tutorial-select-layer.docbook tool-gradient.png tutorial-select-layer-11.png toolbar-brushes-brushshapes-autobrush.png tool-crop.png tool-polyline.png mainscreen.png tutorial-quick-starts4.png crocusses-meanremoval.png Makefile.am createdocument.png
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.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
-@@ -735,20 +741,20 @@
+@@ -733,20 +742,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita
-- @for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
-+ @for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+- @for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
++ @for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
done
uninstall-nls:
-- for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
-+ for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+- for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
++ for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
-+ for file in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+- for file in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
++ for file in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kspread/Makefile.in
+++ doc/kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69813,24 +63360,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69839,7 +63432,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69853,13 +63446,15 @@
mostlyclean-libtool:
--- doc/kugar/Makefile.in
+++ doc/kugar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69869,24 +63464,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69895,7 +63536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69909,13 +63550,15 @@
mostlyclean-libtool:
--- doc/kword/Makefile.in
+++ doc/kword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69925,24 +63568,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69951,7 +63640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69965,13 +63654,15 @@
mostlyclean-libtool:
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69981,24 +63672,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -70007,7 +63744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70021,13 +63758,15 @@
mostlyclean-libtool:
--- doc/thesaurus/Makefile.in
+++ doc/thesaurus/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70037,24 +63776,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70063,7 +63848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70077,35 +63862,15 @@
mostlyclean-libtool:
--- example/Makefile.in
+++ example/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
--#>+ 1
--SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -118,7 +114,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
-+#>- SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
-+#>+ 1
-+SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
- #>- DIST_SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
-@@ -313,6 +311,9 @@
+@@ -174,6 +174,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -311,6 +312,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70115,24 +63880,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,6 +525,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -572,6 +575,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -628,7 +632,7 @@
+@@ -369,18 +373,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -435,8 +437,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -459,6 +464,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -540,6 +546,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -556,12 +563,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -624,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70141,7 +63952,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +670,9 @@
+@@ -662,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70155,22 +63966,15 @@
@$(NORMAL_INSTALL)
--- filters/generic_wrapper/Makefile.in
+++ filters/generic_wrapper/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libgenerickofilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70180,24 +63984,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70206,7 +64056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70220,22 +64070,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/ai/Makefile.in
+++ filters/karbon/ai/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonaiimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70245,24 +64088,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -622,7 +626,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -618,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70271,7 +64160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +664,9 @@
+@@ -656,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70285,22 +64174,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/applixgraphics/Makefile.in
+++ filters/karbon/applixgraphics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libapplixgraphicimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70310,24 +64192,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70336,7 +64264,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70350,22 +64278,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/eps/Makefile.in
+++ filters/karbon/eps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonepsexport_la_SOURCES) $(libkarbonepsimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -293,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70375,24 +64296,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,6 +507,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -554,6 +557,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -615,7 +619,7 @@
+@@ -351,18 +355,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -417,8 +419,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -441,6 +446,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -522,6 +528,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -538,12 +545,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70401,7 +64368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +657,9 @@
+@@ -649,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70415,22 +64382,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/kontour/Makefile.in
+++ filters/karbon/kontour/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkarbonkontourimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70440,24 +64400,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -70466,7 +64472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70480,13 +64486,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/Makefile.in
+++ filters/karbon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70496,24 +64504,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -70522,7 +64576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70536,22 +64590,15 @@
mostlyclean-libtool:
--- filters/karbon/msod/Makefile.in
+++ filters/karbon/msod/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkarbonmsodimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70561,24 +64608,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -586,7 +590,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70587,7 +64680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +628,9 @@
+@@ -620,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70601,22 +64694,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/oodraw/Makefile.in
+++ filters/karbon/oodraw/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(liboodrawimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70626,24 +64712,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -588,7 +592,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70652,7 +64784,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +630,9 @@
+@@ -622,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70666,22 +64798,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/png/Makefile.in
+++ filters/karbon/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonpngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70691,24 +64816,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -593,7 +597,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70717,7 +64888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -627,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70731,22 +64902,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/svg/Makefile.in
+++ filters/karbon/svg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonsvgexport_la_SOURCES) $(libkarbonsvgimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70756,24 +64920,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -607,7 +611,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70782,7 +64992,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +649,9 @@
+@@ -641,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70796,22 +65006,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/wmf/Makefile.in
+++ filters/karbon/wmf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libwmfexport_la_SOURCES) $(libwmfimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70821,24 +65024,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70847,7 +65096,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70861,22 +65110,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/xaml/Makefile.in
+++ filters/karbon/xaml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonxamlexport_la_SOURCES) $(libkarbonxamlimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70886,24 +65128,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -608,7 +612,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70912,7 +65200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +650,9 @@
+@@ -642,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70926,22 +65214,15 @@
@$(NORMAL_INSTALL)
--- filters/karbon/xcf/Makefile.in
+++ filters/karbon/xcf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkarbonxcfexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70951,24 +65232,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -593,7 +597,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -70977,7 +65304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -627,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70991,22 +65318,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/bmp/Makefile.in
+++ filters/kchart/bmp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartbmpexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71016,24 +65336,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71042,7 +65408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71056,22 +65422,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/jpeg/Makefile.in
+++ filters/kchart/jpeg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartjpegexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71081,24 +65440,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71107,7 +65512,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71121,22 +65526,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/libimageexport/Makefile.in
+++ filters/kchart/libimageexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkchartimageexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71146,24 +65544,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -588,7 +592,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71172,7 +65616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +630,9 @@
+@@ -622,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71186,13 +65630,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/Makefile.in
+++ filters/kchart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71202,24 +65648,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71228,7 +65720,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71242,22 +65734,15 @@
mostlyclean-libtool:
--- filters/kchart/mng/Makefile.in
+++ filters/kchart/mng/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartmngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71267,24 +65752,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71293,7 +65824,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71307,22 +65838,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/png/Makefile.in
+++ filters/kchart/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartpngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71332,24 +65856,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71358,7 +65928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71372,22 +65942,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/svg/Makefile.in
+++ filters/kchart/svg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartsvgexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71397,24 +65960,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -71423,7 +66032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71437,22 +66046,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/xbm/Makefile.in
+++ filters/kchart/xbm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartxbmexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71462,24 +66064,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71488,7 +66136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71502,22 +66150,15 @@
@$(NORMAL_INSTALL)
--- filters/kchart/xpm/Makefile.in
+++ filters/kchart/xpm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkchartxpmexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71527,24 +66168,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71553,7 +66240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71567,22 +66254,15 @@
@$(NORMAL_INSTALL)
--- filters/kformula/latex/Makefile.in
+++ filters/kformula/latex/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkfolatexexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71592,24 +66272,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -71618,7 +66344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71632,13 +66358,15 @@
@$(NORMAL_INSTALL)
--- filters/kformula/Makefile.in
+++ filters/kformula/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71648,24 +66376,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71674,7 +66448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71688,22 +66462,15 @@
mostlyclean-libtool:
--- filters/kformula/mathml/Makefile.in
+++ filters/kformula/mathml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkfomathmlexport_la_SOURCES) $(libkfomathmlimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71713,24 +66480,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -596,7 +600,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -71739,7 +66552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +638,9 @@
+@@ -630,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71753,22 +66566,15 @@
@$(NORMAL_INSTALL)
--- filters/kformula/png/Makefile.in
+++ filters/kformula/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkfopngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71778,24 +66584,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -71804,7 +66656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71818,22 +66670,15 @@
@$(NORMAL_INSTALL)
--- filters/kformula/svg/Makefile.in
+++ filters/kformula/svg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkfosvgexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71843,24 +66688,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -71869,7 +66760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71883,22 +66774,15 @@
@$(NORMAL_INSTALL)
--- filters/kivio/imageexport/Makefile.in
+++ filters/kivio/imageexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkivioimageexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71908,24 +66792,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -71934,7 +66864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71948,13 +66878,15 @@
@$(NORMAL_INSTALL)
--- filters/kivio/Makefile.in
+++ filters/kivio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71964,24 +66896,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71990,7 +66968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72004,22 +66982,15 @@
mostlyclean-libtool:
--- filters/kpresenter/bmp/Makefile.in
+++ filters/kpresenter/bmp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresenterbmpexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72029,24 +67000,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72055,7 +67072,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72069,22 +67086,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/jpeg/Makefile.in
+++ filters/kpresenter/jpeg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresenterjpegexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72094,24 +67104,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72120,7 +67176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72134,22 +67190,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/kword/Makefile.in
+++ filters/kpresenter/kword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkprkword_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72159,24 +67208,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,6 +490,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -537,6 +540,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -574,7 +578,7 @@
+@@ -334,18 +338,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -424,6 +429,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -505,6 +511,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -521,12 +528,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -570,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -72185,7 +67280,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +616,9 @@
+@@ -608,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72199,22 +67294,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/libimageexport/Makefile.in
+++ filters/kpresenter/libimageexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkpresenterimageexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72224,24 +67312,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -585,7 +589,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72250,7 +67384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +627,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72264,13 +67398,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/magicpoint/Makefile.in
+++ filters/kpresenter/magicpoint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -246,6 +246,9 @@
+@@ -109,6 +109,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72280,24 +67416,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,6 +460,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -505,6 +510,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -534,7 +540,7 @@
+@@ -304,18 +308,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -370,8 +372,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -394,6 +399,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -475,6 +481,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -491,12 +498,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -532,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72306,7 +67488,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +578,9 @@
+@@ -570,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72320,13 +67502,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/Makefile.in
+++ filters/kpresenter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72336,24 +67520,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -72362,7 +67592,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72376,22 +67606,15 @@
mostlyclean-libtool:
--- filters/kpresenter/mng/Makefile.in
+++ filters/kpresenter/mng/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresentermngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72401,24 +67624,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72427,7 +67696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72441,22 +67710,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/ooimpress/Makefile.in
+++ filters/kpresenter/ooimpress/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libooimpressexport_la_SOURCES) $(libooimpressimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72466,24 +67728,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -72492,7 +67800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72506,22 +67814,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/png/Makefile.in
+++ filters/kpresenter/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresenterpngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72531,24 +67832,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72557,7 +67904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72571,22 +67918,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/powerpoint/import/Makefile.in
+++ filters/kpresenter/powerpoint/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libpowerpointimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72596,24 +67936,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -577,7 +581,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -72622,7 +68008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +619,9 @@
+@@ -611,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72636,22 +68022,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/powerpoint/libppt/Makefile.in
+++ filters/kpresenter/powerpoint/libppt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libppt_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -268,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72661,24 +68040,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,6 +482,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -529,6 +532,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -559,7 +563,7 @@
+@@ -326,18 +330,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -416,6 +421,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -497,6 +503,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -513,12 +520,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72687,7 +68112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72701,13 +68126,15 @@
clean-noinstLTLIBRARIES:
--- filters/kpresenter/powerpoint/Makefile.in
+++ filters/kpresenter/powerpoint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72717,24 +68144,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -72743,7 +68216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72757,22 +68230,15 @@
mostlyclean-libtool:
--- filters/kpresenter/svg/Makefile.in
+++ filters/kpresenter/svg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresentersvgexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72782,24 +68248,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -72808,7 +68320,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72822,22 +68334,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/xbm/Makefile.in
+++ filters/kpresenter/xbm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresenterxbmexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72847,24 +68352,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72873,7 +68424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72887,22 +68438,15 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/xpm/Makefile.in
+++ filters/kpresenter/xpm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresenterxpmexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72912,24 +68456,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -72938,7 +68528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72952,22 +68542,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/jpeg/Makefile.in
+++ filters/krita/jpeg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritaconverter_la_SOURCES) $(libkritajpegexport_la_SOURCES) $(libkritajpegimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -312,6 +310,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -310,6 +311,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72977,24 +68560,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,6 +524,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -571,6 +574,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -645,7 +649,7 @@
+@@ -368,18 +372,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -434,8 +436,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -458,6 +463,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -539,6 +545,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -555,12 +562,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -641,7 +650,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -73003,7 +68632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -683,9 +687,9 @@
+@@ -679,9 +688,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73017,22 +68646,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/libkisexif/Makefile.in
+++ filters/krita/libkisexif/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkisexif_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -263,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73042,24 +68664,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,6 +477,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -524,6 +527,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -568,7 +572,7 @@
+@@ -321,18 +325,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +389,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -411,6 +416,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -492,6 +498,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -508,12 +515,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -73068,7 +68736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +610,9 @@
+@@ -602,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73082,22 +68750,15 @@
clean-noinstLTLIBRARIES:
--- filters/krita/magick/Makefile.in
+++ filters/krita/magick/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritamagickexport_la_SOURCES) $(libkritamagickimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -298,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73107,24 +68768,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,6 +512,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -559,6 +562,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -356,18 +360,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,8 +424,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -446,6 +451,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -527,6 +533,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -543,12 +550,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -73133,7 +68840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73147,13 +68854,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/Makefile.in
+++ filters/krita/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73163,24 +68872,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -543,7 +549,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -73189,7 +68944,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73203,22 +68958,15 @@
mostlyclean-libtool:
--- filters/krita/openexr/Makefile.in
+++ filters/krita/openexr/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkrita_openexr_export_la_SOURCES) $(libkrita_openexr_import_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73228,24 +68976,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -73254,7 +69048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73268,22 +69062,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/png/Makefile.in
+++ filters/krita/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritapngexport_la_SOURCES) $(libkritapngimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73293,24 +69080,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -73319,7 +69152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73333,22 +69166,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/raw/Makefile.in
+++ filters/krita/raw/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkrita_raw_import_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73358,24 +69184,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -73384,7 +69256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73398,22 +69270,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/tiff/Makefile.in
+++ filters/krita/tiff/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkritatiffconverter_la_SOURCES) $(libkritatiffexport_la_SOURCES) $(libkritatiffimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -315,6 +313,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -313,6 +314,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73423,24 +69288,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,6 +527,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -574,6 +577,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -657,7 +661,7 @@
+@@ -371,18 +375,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -437,8 +439,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -461,6 +466,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -542,6 +548,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -558,12 +565,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -653,7 +662,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -73449,7 +69360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -695,9 +699,9 @@
+@@ -691,9 +700,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73463,22 +69374,15 @@
@$(NORMAL_INSTALL)
--- filters/krita/xcf/Makefile.in
+++ filters/krita/xcf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritaxcfexport_la_SOURCES) $(libkritaxcfimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -299,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73488,24 +69392,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,6 +513,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -560,6 +563,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -357,18 +361,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -423,8 +425,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -447,6 +452,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -528,6 +534,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -544,12 +551,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -73514,7 +69464,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73528,22 +69478,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/applixspread/Makefile.in
+++ filters/kspread/applixspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libapplixspreadimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73553,24 +69496,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -73579,7 +69568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73593,22 +69582,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/csv/Makefile.in
+++ filters/kspread/csv/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libcsvexport_la_SOURCES) $(libcsvimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -291,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73618,24 +69600,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,6 +505,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -552,6 +555,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -349,18 +353,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,8 +417,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -439,6 +444,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -520,6 +526,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -536,12 +543,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -73644,7 +69672,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73658,22 +69686,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/dbase/Makefile.in
+++ filters/kspread/dbase/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libdbaseimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73683,24 +69704,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -73709,7 +69776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73723,22 +69790,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/excel/import/Makefile.in
+++ filters/kspread/excel/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libexcelimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73748,24 +69808,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -73774,7 +69880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73788,13 +69894,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/excel/Makefile.in
+++ filters/kspread/excel/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -251,6 +251,9 @@
+@@ -114,6 +114,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73804,24 +69912,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,6 +465,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -510,6 +515,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -544,7 +550,7 @@
+@@ -309,18 +313,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +377,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -399,6 +404,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -480,6 +486,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -496,12 +503,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -542,7 +551,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -73830,7 +69984,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +588,9 @@
+@@ -580,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73844,22 +69998,15 @@
mostlyclean-libtool:
--- filters/kspread/excel/sidewinder/Makefile.in
+++ filters/kspread/excel/sidewinder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libsidewinder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -268,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73869,24 +70016,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,6 +482,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -529,6 +532,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -559,7 +563,7 @@
+@@ -326,18 +330,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -416,6 +421,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -497,6 +503,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -513,12 +520,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -73895,7 +70088,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73909,22 +70102,15 @@
clean-noinstLTLIBRARIES:
--- filters/kspread/gnumeric/Makefile.in
+++ filters/kspread/gnumeric/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libgnumericexport_la_SOURCES) $(libgnumericimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73934,24 +70120,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -73960,7 +70192,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73974,22 +70206,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/html/Makefile.in
+++ filters/kspread/html/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkspreadhtmlexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73999,24 +70224,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74025,7 +70296,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74039,22 +70310,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/latex/export/Makefile.in
+++ filters/kspread/latex/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkspreadlatexexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74064,24 +70328,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -615,7 +619,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74090,7 +70400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +657,9 @@
+@@ -649,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74104,13 +70414,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/latex/Makefile.in
+++ filters/kspread/latex/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74120,24 +70432,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -74146,7 +70504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74160,22 +70518,15 @@
mostlyclean-libtool:
--- filters/kspread/libkspreadexport/Makefile.in
+++ filters/kspread/libkspreadexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkspreadexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74185,24 +70536,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74211,7 +70608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74225,13 +70622,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/Makefile.in
+++ filters/kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74241,24 +70640,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -74267,7 +70712,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74281,22 +70726,15 @@
mostlyclean-libtool:
--- filters/kspread/opencalc/Makefile.in
+++ filters/kspread/opencalc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libopencalcexport_la_SOURCES) $(libopencalcimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74306,24 +70744,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -601,7 +605,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74332,7 +70816,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74346,13 +70830,15 @@
@$(NORMAL_INSTALL)
--- filters/kspread/qpro/libqpro/Makefile.in
+++ filters/kspread/qpro/libqpro/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74362,24 +70848,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -74388,7 +70920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74402,13 +70934,15 @@
mostlyclean-libtool:
--- filters/kspread/qpro/libqpro/qpro/Makefile.in
+++ filters/kspread/qpro/libqpro/qpro/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -238,6 +238,9 @@
+@@ -101,6 +101,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -238,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74418,24 +70952,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,6 +452,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -497,6 +502,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -524,7 +530,7 @@
+@@ -296,18 +300,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -386,6 +391,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -467,6 +473,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -483,12 +490,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -522,7 +531,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -74444,7 +71024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +568,9 @@
+@@ -560,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74458,22 +71038,15 @@
mostlyclean-libtool:
--- filters/kspread/qpro/libqpro/src/Makefile.in
+++ filters/kspread/qpro/libqpro/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libqpro_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -268,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74483,24 +71056,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,6 +482,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -529,6 +532,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -559,7 +563,7 @@
+@@ -326,18 +330,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -416,6 +421,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -497,6 +503,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -513,12 +520,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74509,7 +71128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74523,22 +71142,15 @@
clean-noinstLTLIBRARIES:
--- filters/kspread/qpro/Makefile.in
+++ filters/kspread/qpro/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libqproimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74548,24 +71160,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74574,7 +71232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74588,22 +71246,15 @@
@$(NORMAL_INSTALL)
--- filters/kugar/kugarnop/Makefile.in
+++ filters/kugar/kugarnop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkugarnopimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74613,24 +71264,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -578,7 +582,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -74639,7 +71336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +620,9 @@
+@@ -612,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74653,13 +71350,15 @@
@$(NORMAL_INSTALL)
--- filters/kugar/Makefile.in
+++ filters/kugar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74669,24 +71368,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -74695,7 +71440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74709,22 +71454,15 @@
mostlyclean-libtool:
--- filters/kword/abiword/Makefile.in
+++ filters/kword/abiword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libabiwordexport_la_SOURCES) $(libabiwordimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74734,24 +71472,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74760,7 +71544,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74774,22 +71558,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/amipro/Makefile.in
+++ filters/kword/amipro/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libamiproexport_la_SOURCES) $(libamiproimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -291,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74799,24 +71576,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,6 +505,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -552,6 +555,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +601,7 @@
+@@ -349,18 +353,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,8 +417,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -439,6 +444,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -520,6 +526,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -536,12 +543,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -74825,7 +71648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +639,9 @@
+@@ -631,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74839,22 +71662,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/applixword/Makefile.in
+++ filters/kword/applixword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libapplixwordimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74864,24 +71680,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74890,7 +71752,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74904,22 +71766,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/ascii/Makefile.in
+++ filters/kword/ascii/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libasciiexport_la_SOURCES) $(libasciiimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74929,24 +71784,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -606,7 +610,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -74955,7 +71856,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +648,9 @@
+@@ -640,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74969,22 +71870,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/docbook/Makefile.in
+++ filters/kword/docbook/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libdocbookexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74994,24 +71888,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75020,7 +71960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75034,22 +71974,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/hancomword/Makefile.in
+++ filters/kword/hancomword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libhancomwordimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75059,24 +71992,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -75085,7 +72064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75099,22 +72078,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/html/export/Makefile.in
+++ filters/kword/html/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libhtmlexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75124,24 +72096,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75150,7 +72168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75164,22 +72182,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/html/import/Makefile.in
+++ filters/kword/html/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libhtmlimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75189,24 +72200,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -588,7 +592,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -75215,7 +72272,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +630,9 @@
+@@ -622,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75229,13 +72286,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/html/Makefile.in
+++ filters/kword/html/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75245,24 +72304,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75271,7 +72376,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75285,22 +72390,15 @@
mostlyclean-libtool:
--- filters/kword/kword1.3/import/Makefile.in
+++ filters/kword/kword1.3/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
- ####### General stuff
-
--SOURCES = $(libkwordkword1dot3import_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75310,24 +72408,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -75336,7 +72480,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75350,13 +72494,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/kword1.3/Makefile.in
+++ filters/kword/kword1.3/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75366,24 +72512,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75392,7 +72584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75406,22 +72598,15 @@
mostlyclean-libtool:
--- filters/kword/latex/export/Makefile.in
+++ filters/kword/latex/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkwordlatexexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75431,24 +72616,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -615,7 +619,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75457,7 +72688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +657,9 @@
+@@ -649,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75471,22 +72702,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/latex/import/generator/Makefile.in
+++ filters/kword/latex/import/generator/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(liblatexgenerator_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75496,24 +72720,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -580,7 +584,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75522,7 +72792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75536,22 +72806,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/latex/import/Makefile.in
+++ filters/kword/latex/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkwordlateximport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -299,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75561,24 +72824,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,6 +513,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -560,6 +563,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -614,7 +618,7 @@
+@@ -357,18 +361,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -423,8 +425,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -447,6 +452,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -528,6 +534,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -544,12 +551,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75587,7 +72896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +656,9 @@
+@@ -648,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75601,22 +72910,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/latex/import/parser/Makefile.in
+++ filters/kword/latex/import/parser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(liblatexparser_la_SOURCES) $(texlauncher_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75626,24 +72928,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +601,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75652,7 +73000,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +639,9 @@
+@@ -631,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75666,13 +73014,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/latex/Makefile.in
+++ filters/kword/latex/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75682,24 +73032,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75708,7 +73104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75722,22 +73118,15 @@
mostlyclean-libtool:
--- filters/kword/libexport/Makefile.in
+++ filters/kword/libexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkwordexportfilters_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75747,24 +73136,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -588,7 +592,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -75773,7 +73208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +630,9 @@
+@@ -622,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75787,13 +73222,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/Makefile.in
+++ filters/kword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -251,6 +251,9 @@
+@@ -114,6 +114,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75803,24 +73240,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,6 +465,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -510,6 +515,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -541,7 +547,7 @@
+@@ -309,18 +313,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +377,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -399,6 +404,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -480,6 +486,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -496,12 +503,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -539,7 +548,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75829,7 +73312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -577,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75843,22 +73326,15 @@
mostlyclean-libtool:
--- filters/kword/msword/Makefile.in
+++ filters/kword/msword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libmswordimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75868,24 +73344,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -75894,7 +73416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75908,22 +73430,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/mswrite/Makefile.in
+++ filters/kword/mswrite/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libmswriteexport_la_SOURCES) $(libmswriteimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -305,6 +303,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -303,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75933,24 +73448,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,6 +517,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -564,6 +567,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -622,7 +626,7 @@
+@@ -361,18 +365,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -427,8 +429,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -451,6 +456,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -532,6 +538,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -548,12 +555,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -618,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -75959,7 +73520,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +664,9 @@
+@@ -656,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75973,22 +73534,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/oowriter/Makefile.in
+++ filters/kword/oowriter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libcommon_la_SOURCES) $(liboowriterexport_la_SOURCES) $(liboowriterimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -298,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75998,24 +73552,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,6 +512,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -559,6 +562,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -608,7 +612,7 @@
+@@ -356,18 +360,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,8 +424,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -446,6 +451,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -527,6 +533,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -543,12 +550,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -76024,7 +73624,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +650,9 @@
+@@ -642,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76038,22 +73638,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/palmdoc/Makefile.in
+++ filters/kword/palmdoc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libpalmdocexport_la_SOURCES) $(libpalmdocimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76063,24 +73656,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -601,7 +605,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -76089,7 +73728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76103,22 +73742,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/pdf/Makefile.in
+++ filters/kword/pdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libpdfimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76128,24 +73760,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +601,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -76154,7 +73832,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +639,9 @@
+@@ -631,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76168,22 +73846,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/pdf/xpdf/goo/Makefile.in
+++ filters/kword/pdf/xpdf/goo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libgoo_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76193,24 +73864,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,6 +490,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -537,6 +540,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -569,7 +573,7 @@
+@@ -334,18 +338,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -424,6 +429,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -505,6 +511,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -521,12 +528,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -565,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -76219,7 +73936,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +611,9 @@
+@@ -603,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76233,13 +73950,15 @@
clean-noinstLTLIBRARIES:
--- filters/kword/pdf/xpdf/Makefile.in
+++ filters/kword/pdf/xpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76249,24 +73968,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -76275,7 +74040,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76289,22 +74054,15 @@
mostlyclean-libtool:
--- filters/kword/pdf/xpdf/xpdf/Makefile.in
+++ filters/kword/pdf/xpdf/xpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libxpdf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76314,24 +74072,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -577,7 +581,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -76340,7 +74144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +619,9 @@
+@@ -611,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76354,22 +74158,15 @@
clean-noinstLTLIBRARIES:
--- filters/kword/rtf/export/Makefile.in
+++ filters/kword/rtf/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(librtfexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76379,24 +74176,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -586,7 +590,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -76405,7 +74248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +628,9 @@
+@@ -620,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76419,22 +74262,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/rtf/import/Makefile.in
+++ filters/kword/rtf/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(librtfimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76444,24 +74280,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -76470,7 +74352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76484,13 +74366,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/rtf/Makefile.in
+++ filters/kword/rtf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76500,24 +74384,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -76526,7 +74456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76540,22 +74470,15 @@
mostlyclean-libtool:
--- filters/kword/starwriter/Makefile.in
+++ filters/kword/starwriter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libstarwriterimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76565,24 +74488,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -579,7 +583,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -76591,7 +74560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76605,22 +74574,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/wml/Makefile.in
+++ filters/kword/wml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libwmlexport_la_SOURCES) $(libwmlimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76630,24 +74592,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -596,7 +600,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -76656,7 +74664,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +638,9 @@
+@@ -630,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76670,22 +74678,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/wordperfect/export/Makefile.in
+++ filters/kword/wordperfect/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libwpexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76695,24 +74696,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -76721,7 +74768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76735,22 +74782,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/wordperfect/import/Makefile.in
+++ filters/kword/wordperfect/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libwpimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76760,24 +74800,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -586,7 +590,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cxx .lo .o .obj
@@ -76786,7 +74872,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +628,9 @@
+@@ -620,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76800,13 +74886,15 @@
@$(NORMAL_INSTALL)
--- filters/kword/wordperfect/Makefile.in
+++ filters/kword/wordperfect/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76816,24 +74904,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -76842,7 +74976,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76856,22 +74990,15 @@
mostlyclean-libtool:
--- filters/libdialogfilter/Makefile.in
+++ filters/libdialogfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libdialogfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -263,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76881,24 +75008,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,6 +477,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -524,6 +527,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -555,7 +559,7 @@
+@@ -321,18 +325,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +389,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -411,6 +416,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -492,6 +498,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -508,12 +515,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -551,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -76907,7 +75080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +597,9 @@
+@@ -589,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76921,22 +75094,15 @@
clean-noinstLTLIBRARIES:
--- filters/liboofilter/Makefile.in
+++ filters/liboofilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(liboofilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -268,6 +266,9 @@
+@@ -129,6 +129,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -266,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76946,24 +75112,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,6 +480,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -527,6 +530,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -557,7 +561,7 @@
+@@ -324,18 +328,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -390,8 +392,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -414,6 +419,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -495,6 +501,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -511,12 +518,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -553,7 +562,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -76972,7 +75184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +599,9 @@
+@@ -591,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76986,13 +75198,15 @@
clean-noinstLTLIBRARIES:
--- filters/Makefile.in
+++ filters/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -252,6 +252,9 @@
+@@ -115,6 +115,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77002,24 +75216,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,6 +466,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -511,6 +516,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -548,7 +554,7 @@
+@@ -310,18 +314,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,8 +378,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -400,6 +405,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -481,6 +487,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -497,12 +504,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -77028,7 +75288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +592,9 @@
+@@ -584,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77042,22 +75302,15 @@
mostlyclean-libtool:
--- filters/xsltfilter/export/Makefile.in
+++ filters/xsltfilter/export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libxsltexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -299,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77067,24 +75320,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,6 +513,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -560,6 +563,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -609,7 +613,7 @@
+@@ -357,18 +361,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -423,8 +425,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -447,6 +452,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -528,6 +534,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -544,12 +551,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77093,7 +75392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +651,9 @@
+@@ -643,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77107,13 +75406,15 @@
@$(NORMAL_INSTALL)
--- filters/xsltfilter/export/xsl/kword/Makefile.in
+++ filters/xsltfilter/export/xsl/kword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77123,24 +75424,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -77149,7 +75496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77163,13 +75510,15 @@
mostlyclean-libtool:
--- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
+++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77179,24 +75528,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77205,7 +75600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77219,13 +75614,15 @@
mostlyclean-libtool:
--- filters/xsltfilter/export/xsl/Makefile.in
+++ filters/xsltfilter/export/xsl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77235,24 +75632,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -77261,7 +75704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77275,22 +75718,15 @@
mostlyclean-libtool:
--- filters/xsltfilter/import/Makefile.in
+++ filters/xsltfilter/import/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libxsltimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77300,24 +75736,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77326,7 +75808,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77340,13 +75822,15 @@
@$(NORMAL_INSTALL)
--- filters/xsltfilter/Makefile.in
+++ filters/xsltfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77356,24 +75840,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -77382,7 +75912,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77396,22 +75926,15 @@
mostlyclean-libtool:
--- interfaces/Makefile.in
+++ interfaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkochart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77421,24 +75944,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,6 +490,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -537,6 +540,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -573,7 +577,7 @@
+@@ -334,18 +338,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -424,6 +429,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -505,6 +511,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -521,12 +528,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -569,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77447,7 +76016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +615,9 @@
+@@ -607,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77461,22 +76030,15 @@
@$(NORMAL_INSTALL)
--- karbon/commands/Makefile.in
+++ karbon/commands/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarboncommands_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77486,24 +76048,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -621,7 +625,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77512,7 +76120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +663,9 @@
+@@ -655,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77526,22 +76134,15 @@
clean-noinstLTLIBRARIES:
--- karbon/core/Makefile.in
+++ karbon/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarboncore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77551,24 +76152,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -675,7 +679,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -671,7 +680,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77577,7 +76224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -713,9 +717,9 @@
+@@ -709,9 +718,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77591,13 +76238,15 @@
clean-noinstLTLIBRARIES:
--- karbon/data/Makefile.in
+++ karbon/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77607,24 +76256,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -543,7 +549,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77633,7 +76328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77647,22 +76342,15 @@
mostlyclean-libtool:
--- karbon/dialogs/Makefile.in
+++ karbon/dialogs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarbondialogs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -271,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77672,24 +76360,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,6 +485,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -532,6 +535,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -329,18 +333,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,8 +397,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -419,6 +424,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -500,6 +506,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -516,12 +523,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77698,7 +76432,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77712,22 +76446,15 @@
clean-noinstLTLIBRARIES:
--- karbon/dockers/Makefile.in
+++ karbon/dockers/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarbondockers_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -275,6 +273,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -273,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77737,24 +76464,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,6 +487,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -534,6 +537,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -593,7 +597,7 @@
+@@ -331,18 +335,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,8 +399,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -421,6 +426,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -502,6 +508,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -518,12 +525,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77763,7 +76536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -627,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77777,37 +76550,15 @@
clean-noinstLTLIBRARIES:
--- karbon/Makefile.in
+++ karbon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES)
--#>+ 1
--SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -137,8 +133,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
-+#>- $(libkarbonpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
-- $(libkarbonpart_la_SOURCES)
-+ $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
- #>- DIST_SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
- #>- $(libkarbonpart_la_SOURCES)
- #>+ 2
-@@ -345,6 +344,9 @@
+@@ -207,6 +207,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -344,6 +345,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77817,24 +76568,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,6 +558,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -604,6 +608,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -644,9 +649,9 @@
+@@ -402,18 +406,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -468,8 +470,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -492,6 +497,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -573,6 +579,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -589,12 +596,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -641,9 +650,9 @@
#>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc
#>+ 1
libkarboncommon_la_SOURCES=karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_view.cc karbon_view_iface.cc karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
@@ -77846,7 +76643,7 @@
libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
dockers/libkarbondockers.la \
widgets/libkarbonwidgets.la \
-@@ -687,7 +692,7 @@
+@@ -684,7 +693,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -77855,7 +76652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -725,9 +730,9 @@
+@@ -722,9 +731,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77869,13 +76666,15 @@
@$(NORMAL_INSTALL)
--- karbon/pics/Makefile.in
+++ karbon/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77885,24 +76684,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -521,7 +527,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -519,7 +528,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77911,7 +76756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +565,9 @@
+@@ -557,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77925,22 +76770,15 @@
mostlyclean-libtool:
--- karbon/plugins/flattenpath/Makefile.in
+++ karbon/plugins/flattenpath/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_flattenpathplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77950,24 +76788,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -77976,7 +76860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77990,22 +76874,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/imagetool/Makefile.in
+++ karbon/plugins/imagetool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_imagetoolplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78015,24 +76892,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -580,7 +584,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78041,7 +76964,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78055,22 +76978,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/insertknots/Makefile.in
+++ karbon/plugins/insertknots/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_insertknotsplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78080,24 +76996,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78106,7 +77068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78120,13 +77082,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/Makefile.in
+++ karbon/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78136,24 +77100,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -78162,7 +77172,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78176,22 +77186,15 @@
mostlyclean-libtool:
--- karbon/plugins/roundcorners/Makefile.in
+++ karbon/plugins/roundcorners/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_roundcornersplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78201,24 +77204,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78227,7 +77276,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78241,22 +77290,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/shadoweffect/Makefile.in
+++ karbon/plugins/shadoweffect/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_shadoweffectplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78266,24 +77308,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78292,7 +77380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78306,22 +77394,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/whirlpinch/Makefile.in
+++ karbon/plugins/whirlpinch/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_whirlpinchplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78331,24 +77412,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78357,7 +77484,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78371,22 +77498,15 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/zoomtool/Makefile.in
+++ karbon/plugins/zoomtool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(karbon_zoomtoolplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78396,24 +77516,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -578,7 +582,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78422,7 +77588,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +620,9 @@
+@@ -612,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78436,22 +77602,15 @@
@$(NORMAL_INSTALL)
--- karbon/render/Makefile.in
+++ karbon/render/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libvpainter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78461,24 +77620,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -616,7 +620,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -78487,7 +77692,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +658,9 @@
+@@ -650,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78501,22 +77706,15 @@
clean-noinstLTLIBRARIES:
--- karbon/render/xrgbrender/Makefile.in
+++ karbon/render/xrgbrender/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkarbonxrgbrender_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -260,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78526,24 +77724,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,6 +474,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -521,6 +524,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -551,7 +555,7 @@
+@@ -318,18 +322,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,8 +386,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -408,6 +413,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -489,6 +495,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -505,12 +512,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -78552,7 +77796,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78566,22 +77810,15 @@
clean-noinstLTLIBRARIES:
--- karbon/shapes/Makefile.in
+++ karbon/shapes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarbonshapes_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -271,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78591,24 +77828,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,6 +485,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -532,6 +535,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -329,18 +333,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,8 +397,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -419,6 +424,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -500,6 +506,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -516,12 +523,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78617,7 +77900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78631,13 +77914,15 @@
clean-noinstLTLIBRARIES:
--- karbon/templates/basic/Makefile.in
+++ karbon/templates/basic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78647,24 +77932,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78673,7 +78004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78687,13 +78018,15 @@
mostlyclean-libtool:
--- karbon/templates/Makefile.in
+++ karbon/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78703,24 +78036,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -78729,7 +78108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78743,22 +78122,15 @@
mostlyclean-libtool:
--- karbon/tools/Makefile.in
+++ karbon/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(karbon_defaulttools_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78768,24 +78140,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -644,7 +648,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -640,7 +649,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78794,7 +78212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +686,9 @@
+@@ -678,9 +687,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78808,22 +78226,15 @@
@$(NORMAL_INSTALL)
--- karbon/visitors/Makefile.in
+++ karbon/visitors/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarbonvisitors_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -271,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78833,24 +78244,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,6 +485,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -532,6 +535,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -585,7 +589,7 @@
+@@ -329,18 +333,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,8 +397,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -419,6 +424,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -500,6 +506,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -516,12 +523,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78859,7 +78316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +627,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78873,22 +78330,15 @@
clean-noinstLTLIBRARIES:
--- karbon/widgets/Makefile.in
+++ karbon/widgets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkarbonwidgets_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78898,24 +78348,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -615,7 +619,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -78924,7 +78420,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +657,9 @@
+@@ -649,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78938,22 +78434,15 @@
clean-noinstLTLIBRARIES:
--- kchart/kdchart/Makefile.in
+++ kchart/kdchart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkdchart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -306,6 +304,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -304,6 +305,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78963,24 +78452,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,6 +518,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -565,6 +568,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -673,7 +677,7 @@
+@@ -362,18 +366,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -428,8 +430,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -452,6 +457,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -533,6 +539,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -549,12 +556,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -669,7 +678,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -78989,7 +78524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -711,9 +715,9 @@
+@@ -707,9 +716,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79003,37 +78538,15 @@
@$(NORMAL_INSTALL)
--- kchart/Makefile.in
+++ kchart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -156,8 +152,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
-+#>- $(libkchartpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
-- $(libkchartpart_la_SOURCES)
-+ $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
- #>- DIST_SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
- #>- $(libkchartpart_la_SOURCES)
- #>+ 2
-@@ -368,6 +367,9 @@
+@@ -230,6 +230,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -367,6 +368,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79043,24 +78556,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,6 +581,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -627,6 +631,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -771,7 +776,7 @@
+@@ -425,18 +429,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -491,8 +493,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -515,6 +520,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -596,6 +602,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -612,12 +619,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -768,7 +777,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -79069,7 +78628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -809,9 +814,9 @@
+@@ -806,9 +815,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79083,13 +78642,15 @@
@$(NORMAL_INSTALL)
--- kchart/pics/Makefile.in
+++ kchart/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79099,24 +78660,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79125,7 +78732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79139,13 +78746,15 @@
mostlyclean-libtool:
--- kchart/templates/Makefile.in
+++ kchart/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79155,24 +78764,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79181,7 +78836,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79195,13 +78850,15 @@
mostlyclean-libtool:
--- kchart/toolbar/crystalsvg/Makefile.in
+++ kchart/toolbar/crystalsvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79211,24 +78868,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79237,7 +78940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79251,13 +78954,15 @@
mostlyclean-libtool:
--- kchart/toolbar/locolor/Makefile.in
+++ kchart/toolbar/locolor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79267,24 +78972,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79293,7 +79044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79307,13 +79058,15 @@
mostlyclean-libtool:
--- kchart/toolbar/Makefile.in
+++ kchart/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79323,24 +79076,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -79349,7 +79148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79363,22 +79162,15 @@
mostlyclean-libtool:
--- kdgantt/Makefile.in
+++ kdgantt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkdgantt_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79388,24 +79180,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -626,7 +630,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -79414,7 +79252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -664,9 +668,9 @@
+@@ -660,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79428,13 +79266,15 @@
clean-noinstLTLIBRARIES:
--- kexi/3rdparty/kexisql/Makefile.in
+++ kexi/3rdparty/kexisql/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79444,24 +79284,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -79470,7 +79356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79484,22 +79370,15 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql/src/Makefile.in
+++ kexi/3rdparty/kexisql/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexisql2_la_SOURCES) $(ksqlite2_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79509,24 +79388,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +603,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -79535,7 +79460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79549,13 +79474,15 @@
@$(NORMAL_INSTALL)
--- kexi/3rdparty/kexisql/tool/Makefile.in
+++ kexi/3rdparty/kexisql/tool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79565,24 +79492,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -518,7 +524,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -516,7 +525,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79591,7 +79564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +562,9 @@
+@@ -554,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79605,13 +79578,15 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql3/Makefile.in
+++ kexi/3rdparty/kexisql3/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79621,24 +79596,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -79647,7 +79668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79661,22 +79682,15 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql3/src/Makefile.in
+++ kexi/3rdparty/kexisql3/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkexisql3_la_SOURCES) $(ksqlite_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79686,24 +79700,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -639,7 +643,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -635,7 +644,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -79712,7 +79772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +681,9 @@
+@@ -673,9 +682,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79726,22 +79786,15 @@
@$(NORMAL_INSTALL)
--- kexi/3rdparty/kolibs/Makefile.in
+++ kexi/3rdparty/kolibs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexikolibs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79751,24 +79804,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -79777,7 +79876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79791,13 +79890,15 @@
clean-noinstLTLIBRARIES:
--- kexi/3rdparty/Makefile.in
+++ kexi/3rdparty/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79807,24 +79908,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -79833,7 +79980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79847,22 +79994,15 @@
mostlyclean-libtool:
--- kexi/3rdparty/uuid/Makefile.in
+++ kexi/3rdparty/uuid/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkexiuuid_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -275,6 +273,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -273,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79872,24 +80012,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,6 +487,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -534,6 +537,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -331,18 +335,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,8 +399,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -421,6 +426,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -502,6 +508,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -518,12 +525,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -79898,7 +80084,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79912,22 +80098,15 @@
clean-noinstLTLIBRARIES:
--- kexi/core/Makefile.in
+++ kexi/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexicore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -316,6 +314,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -314,6 +315,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79937,24 +80116,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,6 +528,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -575,6 +578,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -654,7 +658,7 @@
+@@ -372,18 +376,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -438,8 +440,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -462,6 +467,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -543,6 +549,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -559,12 +566,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -650,7 +659,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -79963,7 +80188,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -692,9 +696,9 @@
+@@ -688,9 +697,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79977,13 +80202,15 @@
@$(NORMAL_INSTALL)
--- kexi/data/kde34compat/Makefile.in
+++ kexi/data/kde34compat/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79993,24 +80220,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -538,7 +544,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -536,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80019,7 +80292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +582,9 @@
+@@ -574,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80033,13 +80306,15 @@
mostlyclean-libtool:
--- kexi/data/Makefile.in
+++ kexi/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -267,6 +267,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -267,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80049,24 +80324,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,6 +481,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -526,6 +531,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -610,7 +616,7 @@
+@@ -325,18 +329,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,8 +393,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -415,6 +420,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -496,6 +502,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -512,12 +519,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -80075,7 +80396,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -646,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80089,13 +80410,15 @@
mostlyclean-libtool:
--- kexi/examples/Makefile.in
+++ kexi/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80105,24 +80428,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -518,7 +524,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -516,7 +525,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80131,7 +80500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +562,9 @@
+@@ -554,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80145,22 +80514,15 @@
mostlyclean-libtool:
--- kexi/formeditor/factories/Makefile.in
+++ kexi/formeditor/factories/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kformdesigner_containers_la_SOURCES) $(kformdesigner_stdwidgets_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80170,24 +80532,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80196,7 +80604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80210,22 +80618,15 @@
@$(NORMAL_INSTALL)
--- kexi/formeditor/kdevelop_plugin/Makefile.in
+++ kexi/formeditor/kdevelop_plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkformdesigner_kdev_part_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80235,24 +80636,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80261,7 +80708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80275,22 +80722,15 @@
@$(NORMAL_INSTALL)
--- kexi/formeditor/Makefile.in
+++ kexi/formeditor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkformdesigner_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -310,6 +308,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -308,6 +309,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80300,24 +80740,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,6 +522,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -569,6 +572,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -640,7 +644,7 @@
+@@ -366,18 +370,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -432,8 +434,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -456,6 +461,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -537,6 +543,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -553,12 +560,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -636,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80326,7 +80812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +682,9 @@
+@@ -674,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80340,22 +80826,15 @@
@$(NORMAL_INSTALL)
--- kexi/formeditor/scripting/Makefile.in
+++ kexi/formeditor/scripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkformdesigner_scripting_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80365,24 +80844,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +603,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80391,7 +80916,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80405,22 +80930,15 @@
clean-noinstLTLIBRARIES:
--- kexi/formeditor/test/Makefile.in
+++ kexi/formeditor/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkformdesigner_part_la_SOURCES) $(kformdesigner_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -298,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80430,24 +80948,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,6 +512,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -559,6 +562,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -632,7 +636,7 @@
+@@ -356,18 +360,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,8 +424,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -446,6 +451,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -527,6 +533,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -543,12 +550,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -628,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80456,7 +81020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -670,9 +674,9 @@
+@@ -666,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80470,13 +81034,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/drivers/Makefile.in
+++ kexi/kexidb/drivers/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80486,24 +81052,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -80512,7 +81124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80526,22 +81138,15 @@
mostlyclean-libtool:
--- kexi/kexidb/drivers/mySQL/Makefile.in
+++ kexi/kexidb/drivers/mySQL/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexidb_mysqldriver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80551,24 +81156,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -613,7 +617,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -609,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80577,7 +81228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +655,9 @@
+@@ -647,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80591,22 +81242,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/drivers/odbc/Makefile.in
+++ kexi/kexidb/drivers/odbc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexidb_odbcdriver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80616,24 +81260,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80642,7 +81332,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80656,22 +81346,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/drivers/pqxx/Makefile.in
+++ kexi/kexidb/drivers/pqxx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kexidb_pqxxsqldriver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80681,24 +81364,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -607,7 +611,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80707,7 +81436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +649,9 @@
+@@ -641,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80721,22 +81450,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/drivers/sqlite/Makefile.in
+++ kexi/kexidb/drivers/sqlite/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexidb_sqlite3driver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80746,24 +81468,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -608,7 +612,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80772,7 +81540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +650,9 @@
+@@ -642,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80786,22 +81554,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/drivers/sqlite2/Makefile.in
+++ kexi/kexidb/drivers/sqlite2/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexidb_sqlite2driver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80811,24 +81572,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -611,7 +615,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -607,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80837,7 +81644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +653,9 @@
+@@ -645,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80851,22 +81658,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/Makefile.in
+++ kexi/kexidb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkexidb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -315,6 +313,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -313,6 +314,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80876,24 +81676,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,6 +527,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -574,6 +577,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -643,7 +647,7 @@
+@@ -371,18 +375,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -437,8 +439,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -461,6 +466,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -542,6 +548,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -558,12 +565,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -639,7 +648,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80902,7 +81748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -681,9 +685,9 @@
+@@ -677,9 +686,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80916,22 +81762,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexidb/parser/Makefile.in
+++ kexi/kexidb/parser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexidbparser_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80941,24 +81780,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -80967,7 +81852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80981,22 +81866,15 @@
@$(NORMAL_INSTALL)
--- kexi/kexiutils/Makefile.in
+++ kexi/kexiutils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexiutils_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81006,24 +81884,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -601,7 +605,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81032,7 +81956,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81046,22 +81970,15 @@
@$(NORMAL_INSTALL)
--- kexi/main/Makefile.in
+++ kexi/main/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkeximain_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -309,6 +307,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -307,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81071,24 +81988,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,6 +521,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -568,6 +571,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -645,7 +649,7 @@
+@@ -365,18 +369,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -431,8 +433,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -455,6 +460,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -536,6 +542,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -552,12 +559,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -641,7 +650,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81097,7 +82060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -683,9 +687,9 @@
+@@ -679,9 +688,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81111,22 +82074,15 @@
@$(NORMAL_INSTALL)
--- kexi/main/printing/Makefile.in
+++ kexi/main/printing/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkeximainprinting_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81136,24 +82092,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -625,7 +629,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -621,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81162,7 +82164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -663,9 +667,9 @@
+@@ -659,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81176,22 +82178,15 @@
clean-noinstLTLIBRARIES:
--- kexi/main/startup/Makefile.in
+++ kexi/main/startup/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkeximainstartup_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81201,24 +82196,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -646,7 +650,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -642,7 +651,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81227,7 +82268,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +688,9 @@
+@@ -680,9 +689,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81241,35 +82282,15 @@
clean-noinstLTLIBRARIES:
--- kexi/Makefile.in
+++ kexi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(kexi_la_SOURCES)
--#>+ 1
--SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -103,7 +99,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kexi_la_SOURCES)
-+#>- SOURCES = $(kexi_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
- #>- DIST_SOURCES = $(kexi_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
-@@ -309,6 +307,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -307,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81279,24 +82300,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,6 +521,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -568,6 +571,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -655,7 +659,7 @@
+@@ -365,18 +369,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -431,8 +433,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -455,6 +460,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -536,6 +542,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -552,12 +559,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -651,7 +660,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81305,7 +82372,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +697,9 @@
+@@ -689,9 +698,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81319,22 +82386,15 @@
@$(NORMAL_INSTALL)
--- kexi/migration/Makefile.in
+++ kexi/migration/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
-
-
-
--SOURCES = $(libkeximigrate_la_SOURCES) $(keximigratetest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -318,6 +316,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -316,6 +317,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81344,24 +82404,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,6 +530,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -577,6 +580,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -657,7 +661,7 @@
+@@ -374,18 +378,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -440,8 +442,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -464,6 +469,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -545,6 +551,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -561,12 +568,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -653,7 +662,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81370,7 +82476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -695,9 +699,9 @@
+@@ -691,9 +700,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81384,22 +82490,15 @@
@$(NORMAL_INSTALL)
--- kexi/migration/mysql/Makefile.in
+++ kexi/migration/mysql/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(keximigrate_mysql_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81409,24 +82508,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81435,7 +82580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81449,22 +82594,15 @@
@$(NORMAL_INSTALL)
--- kexi/migration/pqxx/Makefile.in
+++ kexi/migration/pqxx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(keximigrate_pqxx_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81474,24 +82612,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -596,7 +600,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81500,7 +82684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +638,9 @@
+@@ -630,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81514,22 +82698,15 @@
@$(NORMAL_INSTALL)
--- kexi/migration/txt/Makefile.in
+++ kexi/migration/txt/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(keximigrate_txtmigrate_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81539,24 +82716,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81565,7 +82788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81579,13 +82802,15 @@
@$(NORMAL_INSTALL)
--- kexi/pics/Makefile.in
+++ kexi/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -244,6 +244,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -244,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81595,24 +82820,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,6 +458,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -503,6 +508,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -569,7 +575,7 @@
+@@ -302,18 +306,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,8 +370,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -392,6 +397,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -473,6 +479,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -489,12 +496,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -567,7 +576,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81621,7 +82892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -605,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81633,32 +82904,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -880,12 +889,12 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-pixmaplabel.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/pixmaplabel.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-frame.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/frame.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-aoshortest.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aoshortest.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-form_action.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/form_action.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-lineedit.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/lineedit.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-aonarrowest.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aonarrowest.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-table_newobj.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/table_newobj.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-lineedit.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/lineedit.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-form_action.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/form_action.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-spring.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/spring.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-navigator_first.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/navigator_first.png
+@@ -1045,12 +1054,12 @@
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/pixmaplabel.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/frame.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aoshortest.png
++ -rm -f $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/form_action.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/lineedit.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aonarrowest.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/table_newobj.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/lineedit.png
+- -rm -f $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/form_action.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/spring.png
+ -rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/navigator_first.png
--- kexi/plugins/forms/Makefile.in
+++ kexi/plugins/forms/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kexihandler_form_la_SOURCES) $(kformdesigner_kexidbwidgets_la_SOURCES) $(libkexiformutils_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -89,6 +87,7 @@
- libkexiformutils_la_DEPENDENCIES = \
- $(top_builddir)/kexi/core/libkexicore.la \
- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
- am_libkexiformutils_la_OBJECTS = kexiformdataiteminterface.lo \
- kexidataawarewidgetinfo.lo kexidataprovider.lo \
-@@ -339,6 +338,9 @@
+@@ -201,6 +201,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -338,6 +339,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81668,37 +82952,71 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,6 +552,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -598,6 +602,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -658,9 +663,10 @@
- kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
- kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
+@@ -396,18 +400,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -462,8 +464,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -486,6 +491,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -567,6 +573,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -583,12 +590,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -689,7 +698,7 @@
--libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-
- kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
-@@ -687,7 +693,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
@@ -81706,7 +83024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -725,9 +731,9 @@
+@@ -727,9 +736,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81720,22 +83038,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/forms/widgets/Makefile.in
+++ kexi/plugins/forms/widgets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkexiformutilswidgets_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81745,24 +83056,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -620,7 +624,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81771,7 +83128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +662,9 @@
+@@ -654,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81785,22 +83142,15 @@
clean-noinstLTLIBRARIES:
--- kexi/plugins/importexport/csv/Makefile.in
+++ kexi/plugins/importexport/csv/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_csv_importexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81810,24 +83160,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -605,7 +609,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -81836,7 +83232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +647,9 @@
+@@ -639,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81850,13 +83246,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/importexport/Makefile.in
+++ kexi/plugins/importexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81866,24 +83264,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -81892,7 +83336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81906,13 +83350,15 @@
mostlyclean-libtool:
--- kexi/plugins/Makefile.in
+++ kexi/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -255,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81922,24 +83368,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -538,7 +544,7 @@
+@@ -313,18 +317,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,8 +381,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -403,6 +408,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -484,6 +490,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -500,12 +507,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -540,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -81948,7 +83440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +582,9 @@
+@@ -578,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81962,22 +83454,15 @@
mostlyclean-libtool:
--- kexi/plugins/migration/Makefile.in
+++ kexi/plugins/migration/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_migration_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81987,24 +83472,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82013,7 +83544,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82027,22 +83558,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/queries/Makefile.in
+++ kexi/plugins/queries/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_query_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82052,24 +83576,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -617,7 +621,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82078,7 +83648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +659,9 @@
+@@ -651,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82092,22 +83662,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/relations/Makefile.in
+++ kexi/plugins/relations/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_relation_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82117,24 +83680,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -609,7 +613,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82143,7 +83752,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +651,9 @@
+@@ -643,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82157,59 +83766,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/reports/Makefile.in
+++ kexi/plugins/reports/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_report_la_SOURCES) $(kexireportwidgets_la_SOURCES) $(libkexireportutils_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,16 +63,20 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
- kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \
-- ../../widget/utils/libkexiguiutils.la \
-- ../../widget/libkexiextendedwidgets.la \
-- ../../formeditor/libkformdesigner.la \
-- ../forms/libkexiformutils.la ./libkexireportutils.la
-+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
-+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-+ ./libkexireportutils.la
- am_kexihandler_report_la_OBJECTS = kexireports.lo
- #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS)
- #>+ 1
- kexihandler_report_la_OBJECTS = kexireports.lo
- kexireportwidgets_la_DEPENDENCIES = \
- $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
-+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- ./libkexireportutils.la
- am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \
- kexireportfactory.lo
-@@ -87,8 +89,10 @@
- @KDE_USE_FINAL_TRUE at kexireportwidgets_la_OBJECTS = $(kexireportwidgets_la_final_OBJECTS)
- libkexireportutils_la_DEPENDENCIES = \
- $(top_builddir)/kexi/core/libkexicore.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la
- am_libkexireportutils_la_OBJECTS = kexireportpart.lo kexireportview.lo \
- kexireportform.lo
- #>- libkexireportutils_la_OBJECTS = $(am_libkexireportutils_la_OBJECTS)
-@@ -329,6 +333,9 @@
+@@ -196,6 +196,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -333,6 +334,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82219,62 +83784,71 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,6 +547,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -588,6 +597,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -630,25 +640,30 @@
- #>+ 1
- kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined $(KDE_NO_UNDEFINED)
- kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
-- ../../widget/utils/libkexiguiutils.la \
-- ../../widget/libkexiextendedwidgets.la \
-- ../../formeditor/libkformdesigner.la \
-- ../forms/libkexiformutils.la \
-+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
-+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
- ./libkexireportutils.la
+@@ -391,18 +395,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -457,8 +459,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -481,6 +486,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -562,6 +568,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -578,12 +585,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -681,7 +690,7 @@
- kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
- kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
- kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
-+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
-+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- ./libkexireportutils.la
-
- lib_LTLIBRARIES = libkexireportutils.la
- libkexireportutils_la_SOURCES = \
- kexireportpart.cpp kexireportview.cpp kexireportform.cpp
-
--libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
- libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la
-
- kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
- kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
-@@ -670,7 +685,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
@@ -82282,7 +83856,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -708,9 +723,9 @@
+@@ -719,9 +728,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82296,22 +83870,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/kexiapp/Makefile.in
+++ kexi/plugins/scripting/kexiapp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(krosskexiapp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82321,24 +83888,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -614,7 +618,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82347,7 +83960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +656,9 @@
+@@ -648,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82361,22 +83974,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/kexidb/Makefile.in
+++ kexi/plugins/scripting/kexidb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(krosskexidb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -301,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82386,24 +83992,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,6 +515,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -562,6 +565,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -630,7 +634,7 @@
+@@ -359,18 +363,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -425,8 +427,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -449,6 +454,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -530,6 +536,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -546,12 +553,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -626,7 +635,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82412,7 +84064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +672,9 @@
+@@ -664,9 +673,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82426,22 +84078,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/kexiscripting/Makefile.in
+++ kexi/plugins/scripting/kexiscripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kexihandler_script_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -305,6 +303,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -303,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82451,24 +84096,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,6 +517,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -564,6 +567,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -633,7 +637,7 @@
+@@ -361,18 +365,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -427,8 +429,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -451,6 +456,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -532,6 +538,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -548,12 +555,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -629,7 +638,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82477,7 +84168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -671,9 +675,9 @@
+@@ -667,9 +676,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82491,13 +84182,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/Makefile.in
+++ kexi/plugins/scripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82507,24 +84200,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -82533,7 +84272,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82547,13 +84286,15 @@
mostlyclean-libtool:
--- kexi/plugins/scripting/scripts/copycenter/Makefile.in
+++ kexi/plugins/scripting/scripts/copycenter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -238,6 +238,9 @@
+@@ -101,6 +101,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -238,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82563,24 +84304,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,6 +452,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -497,6 +502,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -296,18 +300,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -386,6 +391,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -467,6 +473,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -483,12 +490,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82589,7 +84376,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82603,13 +84390,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
+++ kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -238,6 +238,9 @@
+@@ -101,6 +101,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -238,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82619,24 +84408,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,6 +452,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -497,6 +502,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -296,18 +300,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -386,6 +391,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -467,6 +473,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -483,12 +490,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82645,7 +84480,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82659,13 +84494,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/importxhtml/Makefile.in
+++ kexi/plugins/scripting/scripts/importxhtml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -238,6 +238,9 @@
+@@ -101,6 +101,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -238,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82675,24 +84512,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,6 +452,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -497,6 +502,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -296,18 +300,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -386,6 +391,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -467,6 +473,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -483,12 +490,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82701,7 +84584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82715,13 +84598,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/Makefile.in
+++ kexi/plugins/scripting/scripts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82731,24 +84616,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -82757,7 +84688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82771,13 +84702,15 @@
mostlyclean-libtool:
--- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
+++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -238,6 +238,9 @@
+@@ -101,6 +101,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -238,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82787,24 +84720,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,6 +452,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -497,6 +502,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -296,18 +300,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +364,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -386,6 +391,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -467,6 +473,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -483,12 +490,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82813,7 +84792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82827,13 +84806,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
+++ kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -237,6 +237,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -237,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82843,24 +84824,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,6 +451,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -496,6 +501,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -524,7 +530,7 @@
+@@ -295,18 +299,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,8 +363,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -385,6 +390,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -466,6 +472,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -482,12 +489,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -522,7 +531,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82869,7 +84896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +568,9 @@
+@@ -560,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82883,13 +84910,15 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/python/Makefile.in
+++ kexi/plugins/scripting/scripts/python/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82899,24 +84928,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -551,7 +557,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -82925,7 +85000,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -587,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82939,22 +85014,15 @@
mostlyclean-libtool:
--- kexi/plugins/tables/Makefile.in
+++ kexi/plugins/tables/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_table_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82964,24 +85032,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -609,7 +613,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -82990,7 +85104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +651,9 @@
+@@ -643,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83004,13 +85118,15 @@
@$(NORMAL_INSTALL)
--- kexi/tests/Makefile.in
+++ kexi/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83020,24 +85136,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -83046,7 +85208,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83060,22 +85222,15 @@
mostlyclean-libtool:
--- kexi/tests/newapi/Makefile.in
+++ kexi/tests/newapi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kexidbtest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83085,24 +85240,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -601,7 +605,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83111,7 +85312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83125,22 +85326,15 @@
clean-noinstPROGRAMS:
--- kexi/tests/parser/Makefile.in
+++ kexi/tests/parser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kexidbparser_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -272,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83150,24 +85344,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,6 +486,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -533,6 +536,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -579,7 +583,7 @@
+@@ -330,18 +334,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -396,8 +398,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -420,6 +425,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -501,6 +507,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -517,12 +524,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83176,7 +85416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83190,22 +85430,15 @@
@$(NORMAL_INSTALL)
--- kexi/tests/startup/Makefile.in
+++ kexi/tests/startup/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kexistartuptest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83215,24 +85448,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +601,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83241,7 +85520,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +639,9 @@
+@@ -631,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83255,22 +85534,15 @@
@$(NORMAL_INSTALL)
--- kexi/tests/tableview/Makefile.in
+++ kexi/tests/tableview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kexitableviewtest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83280,24 +85552,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83306,7 +85624,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83320,22 +85638,15 @@
@$(NORMAL_INSTALL)
--- kexi/tests/widgets/Makefile.in
+++ kexi/tests/widgets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kexidbdrivercombotest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -268,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83345,24 +85656,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,6 +482,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -529,6 +532,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -579,7 +583,7 @@
+@@ -326,18 +330,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -416,6 +421,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -497,6 +503,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -513,12 +520,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83371,7 +85728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83385,22 +85742,15 @@
clean-noinstPROGRAMS:
--- kexi/widget/Makefile.in
+++ kexi/widget/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkexiextendedwidgets_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -311,6 +309,9 @@
+@@ -172,6 +172,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -309,6 +310,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83410,24 +85760,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,6 +523,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -570,6 +573,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -668,7 +672,7 @@
+@@ -367,18 +371,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -433,8 +435,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -457,6 +462,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -538,6 +544,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -554,12 +561,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -664,7 +673,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83436,7 +85832,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -706,9 +710,9 @@
+@@ -702,9 +711,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83450,22 +85846,15 @@
@$(NORMAL_INSTALL)
--- kexi/widget/relations/Makefile.in
+++ kexi/widget/relations/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkexirelationsview_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -294,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83475,24 +85864,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,6 +508,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -555,6 +558,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -630,7 +634,7 @@
+@@ -352,18 +356,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,8 +420,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -442,6 +447,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -523,6 +529,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -539,12 +546,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -626,7 +635,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83501,7 +85936,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +672,9 @@
+@@ -664,9 +673,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83515,22 +85950,15 @@
@$(NORMAL_INSTALL)
--- kexi/widget/tableview/Makefile.in
+++ kexi/widget/tableview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexidatatable_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -312,6 +310,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -310,6 +311,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83540,24 +85968,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,6 +524,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -571,6 +574,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -656,7 +660,7 @@
+@@ -368,18 +372,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -434,8 +436,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -458,6 +463,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -539,6 +545,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -555,12 +562,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -652,7 +661,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83566,7 +86040,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -694,9 +698,9 @@
+@@ -690,9 +699,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83580,22 +86054,15 @@
@$(NORMAL_INSTALL)
--- kexi/widget/utils/Makefile.in
+++ kexi/widget/utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkexiguiutils_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83605,24 +86072,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -612,7 +616,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83631,7 +86144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +654,9 @@
+@@ -646,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83645,35 +86158,15 @@
@$(NORMAL_INSTALL)
--- kformula/Makefile.in
+++ kformula/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
--#>+ 1
--SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -123,7 +119,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
-+#>- SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
- #>- DIST_SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
-@@ -333,6 +331,9 @@
+@@ -194,6 +194,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -331,6 +332,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83683,24 +86176,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,6 +545,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -592,6 +595,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -654,7 +658,7 @@
+@@ -389,18 +393,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -455,8 +457,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -479,6 +484,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -560,6 +566,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -576,12 +583,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -650,7 +659,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -83709,7 +86248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -692,9 +696,9 @@
+@@ -688,9 +697,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83723,13 +86262,15 @@
@$(NORMAL_INSTALL)
--- kformula/pics/Makefile.in
+++ kformula/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83739,24 +86280,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -83765,7 +86352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83779,22 +86366,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/config/Makefile.in
+++ kivio/kiviopart/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkivioconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83804,24 +86384,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -580,7 +584,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83830,7 +86456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83844,22 +86470,15 @@
clean-noinstLTLIBRARIES:
--- kivio/kiviopart/kiviosdk/Makefile.in
+++ kivio/kiviopart/kiviosdk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkiviosdk_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83869,24 +86488,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -623,7 +627,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -619,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83895,7 +86560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +665,9 @@
+@@ -657,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83909,37 +86574,15 @@
clean-noinstLTLIBRARIES:
--- kivio/kiviopart/Makefile.in
+++ kivio/kiviopart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES)
--#>+ 1
--SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -150,8 +146,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
-+#>- $(libkiviopart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
-- $(libkiviopart_la_SOURCES)
-+ $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
- #>- DIST_SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
- #>- $(libkiviopart_la_SOURCES)
- #>+ 2
-@@ -362,6 +361,9 @@
+@@ -224,6 +224,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -361,6 +362,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83949,24 +86592,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,6 +575,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -621,6 +625,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -716,7 +721,7 @@
+@@ -419,18 +423,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -485,8 +487,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -509,6 +514,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -590,6 +596,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -606,12 +613,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -713,7 +722,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -83975,7 +86664,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -754,9 +759,9 @@
+@@ -751,9 +760,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83989,13 +86678,15 @@
@$(NORMAL_INSTALL)
--- kivio/kiviopart/pics/Makefile.in
+++ kivio/kiviopart/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84005,24 +86696,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84031,7 +86768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84045,13 +86782,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84061,24 +86800,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -617,7 +623,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -615,7 +624,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84087,7 +86872,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +661,9 @@
+@@ -653,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84101,13 +86886,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84117,24 +86904,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +603,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84143,7 +86976,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84157,13 +86990,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84173,24 +87008,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -979,7 +985,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -977,7 +986,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84199,7 +87080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1017,9 +1023,9 @@
+@@ -1015,9 +1024,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84213,13 +87094,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Civil/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Civil/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84229,24 +87112,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +595,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84255,7 +87184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84269,13 +87198,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Contact/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Contact/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84285,24 +87216,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -569,7 +575,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -567,7 +576,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84311,7 +87288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -605,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84325,13 +87302,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Electric/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Electric/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84341,24 +87320,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -553,7 +559,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -551,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84367,7 +87392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +597,9 @@
+@@ -589,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84381,13 +87406,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84397,24 +87424,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -569,7 +575,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -567,7 +576,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84423,7 +87496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -605,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84437,13 +87510,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84453,24 +87528,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -550,7 +556,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -548,7 +557,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -84479,7 +87600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +594,9 @@
+@@ -586,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84493,13 +87614,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
+++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84509,24 +87632,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -549,7 +555,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84535,7 +87704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84549,13 +87718,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Network/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Network/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84565,24 +87736,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +605,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84591,7 +87808,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84605,13 +87822,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84621,24 +87840,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -577,7 +583,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84647,7 +87912,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84661,13 +87926,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/SDL/Makefile.in
+++ kivio/kiviopart/stencils/Dia/SDL/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84677,24 +87944,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -571,7 +577,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -569,7 +578,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84703,7 +88016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +615,9 @@
+@@ -607,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84717,13 +88030,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84733,24 +88048,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -549,7 +555,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84759,7 +88120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84773,13 +88134,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84789,24 +88152,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -572,7 +578,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -570,7 +579,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84815,7 +88224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +616,9 @@
+@@ -608,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84829,13 +88238,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84845,24 +88256,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -541,7 +547,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -539,7 +548,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84871,7 +88328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -577,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84885,13 +88342,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84901,24 +88360,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -552,7 +558,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -550,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84927,7 +88432,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -588,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84941,13 +88446,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84957,24 +88464,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -84983,7 +88536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84997,13 +88550,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85013,24 +88568,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -569,7 +575,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -567,7 +576,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85039,7 +88640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -605,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85053,13 +88654,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85069,24 +88672,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -85095,7 +88744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85109,13 +88758,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85125,24 +88776,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85151,7 +88848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85165,13 +88862,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85181,24 +88880,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -565,7 +571,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -563,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85207,7 +88952,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +609,9 @@
+@@ -601,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85221,13 +88966,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85237,24 +88984,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -85263,7 +89056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85277,13 +89070,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85293,24 +89088,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85319,7 +89160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85333,13 +89174,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Makefile.in
+++ kivio/kiviopart/stencils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85349,24 +89192,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -85375,7 +89264,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85389,13 +89278,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85405,24 +89296,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -543,7 +549,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85431,7 +89368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85445,13 +89382,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85461,24 +89400,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85487,7 +89472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85501,13 +89486,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85517,24 +89504,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -532,7 +538,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -530,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85543,7 +89576,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +576,9 @@
+@@ -568,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85557,13 +89590,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85573,24 +89608,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -85599,7 +89680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85613,13 +89694,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85629,24 +89712,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -557,7 +563,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85655,7 +89784,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85669,13 +89798,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85685,24 +89816,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -549,7 +555,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85711,7 +89888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85725,13 +89902,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85741,24 +89920,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85767,7 +89992,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85781,13 +90006,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
+++ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85797,24 +90024,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -557,7 +563,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85823,7 +90096,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85837,13 +90110,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
+++ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85853,24 +90128,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -557,7 +563,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85879,7 +90200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85893,13 +90214,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/Makefile.in
+++ kivio/kiviopart/stencils/UML/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85909,24 +90232,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -551,7 +557,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -85935,7 +90304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -587,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85949,13 +90318,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/tiles/Makefile.in
+++ kivio/kiviopart/tiles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -248,6 +248,9 @@
+@@ -111,6 +111,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -248,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85965,24 +90336,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,6 +462,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -507,6 +512,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -306,18 +310,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -372,8 +374,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -396,6 +401,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -477,6 +483,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -493,12 +500,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -85991,7 +90408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86005,22 +90422,15 @@
mostlyclean-libtool:
--- kivio/kiviopart/tools/Makefile.in
+++ kivio/kiviopart/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libtools_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86030,24 +90440,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -586,7 +590,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86056,7 +90512,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +628,9 @@
+@@ -620,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86070,22 +90526,15 @@
clean-noinstLTLIBRARIES:
--- kivio/kiviopart/ui/Makefile.in
+++ kivio/kiviopart/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86095,24 +90544,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -596,7 +600,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86121,7 +90616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +638,9 @@
+@@ -630,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86135,13 +90630,15 @@
clean-noinstLTLIBRARIES:
--- kivio/Makefile.in
+++ kivio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86151,24 +90648,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -86177,7 +90720,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86191,22 +90734,15 @@
mostlyclean-libtool:
--- kivio/plugins/kivioconnectortool/Makefile.in
+++ kivio/plugins/kivioconnectortool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkivioconnectortool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -298,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86216,24 +90752,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,6 +512,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -559,6 +562,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -623,7 +627,7 @@
+@@ -356,18 +360,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,8 +424,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -446,6 +451,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -527,6 +533,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -543,12 +550,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -619,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86242,7 +90824,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +665,9 @@
+@@ -657,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86256,22 +90838,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
+++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(straight_connector_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86281,24 +90856,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86307,7 +90928,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86321,22 +90942,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioselecttool/Makefile.in
+++ kivio/plugins/kivioselecttool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkivioselecttool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86346,24 +90960,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -612,7 +616,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86372,7 +91032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +654,9 @@
+@@ -646,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86386,13 +91046,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioselecttool/select_pics/Makefile.in
+++ kivio/plugins/kivioselecttool/select_pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -248,6 +248,9 @@
+@@ -111,6 +111,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -248,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86402,24 +91064,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,6 +462,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -507,6 +512,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -538,7 +544,7 @@
+@@ -306,18 +310,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -372,8 +374,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -396,6 +401,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -477,6 +483,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -493,12 +500,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -536,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -86428,7 +91136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +582,9 @@
+@@ -574,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86442,22 +91150,15 @@
mostlyclean-libtool:
--- kivio/plugins/kiviosmlconnector/Makefile.in
+++ kivio/plugins/kiviosmlconnector/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkiviosmlconnector_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86467,24 +91168,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86493,7 +91240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86507,22 +91254,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
+++ kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(sml_connector_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86532,24 +91272,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -577,7 +581,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86558,7 +91344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +619,9 @@
+@@ -611,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86572,22 +91358,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviotargettool/Makefile.in
+++ kivio/plugins/kiviotargettool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkiviotargettool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86597,24 +91376,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86623,7 +91448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86637,22 +91462,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviotexttool/Makefile.in
+++ kivio/plugins/kiviotexttool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkiviotexttool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86662,24 +91480,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -614,7 +618,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86688,7 +91552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +656,9 @@
+@@ -648,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86702,22 +91566,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviozoomtool/Makefile.in
+++ kivio/plugins/kiviozoomtool/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkiviozoomtool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86727,24 +91584,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -612,7 +616,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86753,7 +91656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +654,9 @@
+@@ -646,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86767,13 +91670,15 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
+++ kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -248,6 +248,9 @@
+@@ -111,6 +111,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -248,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86783,24 +91688,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,6 +462,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -507,6 +512,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -546,7 +552,7 @@
+@@ -306,18 +310,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -372,8 +374,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -396,6 +401,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -477,6 +483,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -493,12 +500,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -86809,7 +91760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +590,9 @@
+@@ -582,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86823,13 +91774,15 @@
mostlyclean-libtool:
--- kivio/plugins/Makefile.in
+++ kivio/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86839,24 +91792,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -86865,7 +91864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86879,13 +91878,15 @@
mostlyclean-libtool:
--- kivio/templates/basic/Makefile.in
+++ kivio/templates/basic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86895,24 +91896,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -86921,7 +91968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86935,13 +91982,15 @@
mostlyclean-libtool:
--- kivio/templates/Makefile.in
+++ kivio/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86951,24 +92000,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -86977,7 +92072,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86991,35 +92086,15 @@
mostlyclean-libtool:
--- koshell/Makefile.in
+++ koshell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(koshell_la_SOURCES)
--#>+ 1
--SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -105,7 +101,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(koshell_la_SOURCES)
-+#>- SOURCES = $(koshell_la_SOURCES)
-+#>+ 1
-+SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
- #>- DIST_SOURCES = $(koshell_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
-@@ -299,6 +297,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -297,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87029,24 +92104,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,6 +511,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -558,6 +561,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -605,7 +609,7 @@
+@@ -355,18 +359,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -421,8 +423,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -445,6 +450,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -526,6 +532,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -542,12 +549,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -87055,7 +92176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +647,9 @@
+@@ -639,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87069,22 +92190,15 @@
@$(NORMAL_INSTALL)
--- kounavail/Makefile.in
+++ kounavail/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkounavailpart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87094,24 +92208,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -87120,7 +92280,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87134,35 +92294,15 @@
@$(NORMAL_INSTALL)
--- kplato/Makefile.in
+++ kplato/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
--#>+ 1
--SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -161,7 +157,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
-+#>- SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
- #>- DIST_SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
-@@ -370,6 +368,9 @@
+@@ -231,6 +231,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -368,6 +369,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87172,24 +92312,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,6 +582,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -629,6 +632,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -824,7 +828,7 @@
+@@ -426,18 +430,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -492,8 +494,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -516,6 +521,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -597,6 +603,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -613,12 +620,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -820,7 +829,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -87198,7 +92384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -862,9 +866,9 @@
+@@ -858,9 +867,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87212,13 +92398,15 @@
@$(NORMAL_INSTALL)
--- kplato/pics/Makefile.in
+++ kplato/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87228,24 +92416,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87254,7 +92488,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87268,13 +92502,15 @@
mostlyclean-libtool:
--- kplato/reports/Makefile.in
+++ kplato/reports/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87284,24 +92520,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87310,7 +92592,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87324,13 +92606,15 @@
mostlyclean-libtool:
--- kplato/templates/Makefile.in
+++ kplato/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87340,24 +92624,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -87366,7 +92696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87380,13 +92710,15 @@
mostlyclean-libtool:
--- kplato/templates/Simple/Makefile.in
+++ kplato/templates/Simple/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87396,24 +92728,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87422,7 +92800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87436,22 +92814,15 @@
mostlyclean-libtool:
--- kplato/tests/Makefile.in
+++ kplato/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_CalendarTester_la_SOURCES) $(kunittest_DateTimeTester_la_SOURCES) $(kunittest_DurationTester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87461,24 +92832,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -584,7 +588,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87487,7 +92904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +626,9 @@
+@@ -618,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87501,13 +92918,15 @@
clean-checkLTLIBRARIES:
--- kplato/toolbar/Makefile.in
+++ kplato/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87517,24 +92936,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87543,7 +93008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87557,22 +93022,15 @@
mostlyclean-libtool:
--- kpresenter/autoformEdit/Makefile.in
+++ kpresenter/autoformEdit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
- ####### General stuff
-
--SOURCES = $(libaf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -268,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87582,24 +93040,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,6 +482,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -529,6 +532,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -562,7 +566,7 @@
+@@ -326,18 +330,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,8 +394,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -416,6 +421,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -497,6 +503,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -513,12 +520,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87608,7 +93112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +604,9 @@
+@@ -596,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87622,13 +93126,15 @@
clean-noinstLTLIBRARIES:
--- kpresenter/autoforms/Arrows/Makefile.in
+++ kpresenter/autoforms/Arrows/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -246,6 +246,9 @@
+@@ -109,6 +109,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87638,24 +93144,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,6 +460,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -505,6 +510,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -549,7 +555,7 @@
+@@ -304,18 +308,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -370,8 +372,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -394,6 +399,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -475,6 +481,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -491,12 +498,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87664,7 +93216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87678,13 +93230,15 @@
mostlyclean-libtool:
--- kpresenter/autoforms/Connections/Makefile.in
+++ kpresenter/autoforms/Connections/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -246,6 +246,9 @@
+@@ -109,6 +109,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -246,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87694,24 +93248,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,6 +460,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -505,6 +510,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -555,7 +561,7 @@
+@@ -304,18 +308,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -370,8 +372,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -394,6 +399,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -475,6 +481,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -491,12 +498,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -553,7 +562,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87720,7 +93320,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -591,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87734,13 +93334,15 @@
mostlyclean-libtool:
--- kpresenter/autoforms/Makefile.in
+++ kpresenter/autoforms/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87750,24 +93352,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -87776,7 +93424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87790,13 +93438,15 @@
mostlyclean-libtool:
--- kpresenter/dtd/Makefile.in
+++ kpresenter/dtd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87806,24 +93456,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87832,7 +93528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87846,37 +93542,15 @@
mostlyclean-libtool:
--- kpresenter/Makefile.in
+++ kpresenter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES)
--#>+ 1
--SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -193,8 +189,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
-+#>- $(libkpresenterprivate_la_SOURCES)
-+#>+ 2
- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
-- $(libkpresenterprivate_la_SOURCES)
-+ $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
- #>- DIST_SOURCES = $(kpresenter_la_SOURCES) \
- #>- $(libkpresenterpart_la_SOURCES) \
- #>- $(libkpresenterprivate_la_SOURCES)
-@@ -406,6 +405,9 @@
+@@ -268,6 +268,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -405,6 +406,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87886,24 +93560,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,6 +619,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -665,6 +669,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -846,7 +851,7 @@
+@@ -463,18 +467,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -529,8 +531,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -553,6 +558,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -634,6 +640,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -650,12 +657,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -843,7 +852,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87912,7 +93632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -884,9 +889,9 @@
+@@ -881,9 +890,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87926,13 +93646,15 @@
@$(NORMAL_INSTALL)
--- kpresenter/pics/Makefile.in
+++ kpresenter/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87942,24 +93664,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -548,7 +554,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -87968,7 +93736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +592,9 @@
+@@ -584,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87982,13 +93750,15 @@
mostlyclean-libtool:
--- kpresenter/pics/rotate/Makefile.in
+++ kpresenter/pics/rotate/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87998,24 +93768,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -532,7 +538,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -530,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88024,7 +93840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +576,9 @@
+@@ -568,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88038,13 +93854,15 @@
mostlyclean-libtool:
--- kpresenter/slideshow/Makefile.in
+++ kpresenter/slideshow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88054,24 +93872,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88080,7 +93944,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88094,13 +93958,15 @@
mostlyclean-libtool:
--- kpresenter/templates/A4/Makefile.in
+++ kpresenter/templates/A4/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88110,24 +93976,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88136,7 +94048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88150,13 +94062,15 @@
mostlyclean-libtool:
--- kpresenter/templates/common_icon/Makefile.in
+++ kpresenter/templates/common_icon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88166,24 +94080,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88192,7 +94152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88206,13 +94166,15 @@
mostlyclean-libtool:
--- kpresenter/templates/legal/Makefile.in
+++ kpresenter/templates/legal/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88222,24 +94184,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88248,7 +94256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88262,13 +94270,15 @@
mostlyclean-libtool:
--- kpresenter/templates/letter/Makefile.in
+++ kpresenter/templates/letter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88278,24 +94288,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88304,7 +94360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88318,13 +94374,15 @@
mostlyclean-libtool:
--- kpresenter/templates/Makefile.in
+++ kpresenter/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88334,24 +94392,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -88360,7 +94464,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88374,13 +94478,15 @@
mostlyclean-libtool:
--- kpresenter/templates/Screen/Makefile.in
+++ kpresenter/templates/Screen/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88390,24 +94496,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88416,7 +94568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88430,13 +94582,15 @@
mostlyclean-libtool:
--- kpresenter/templates/Screenpresentations/Makefile.in
+++ kpresenter/templates/Screenpresentations/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88446,24 +94600,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -545,7 +551,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88472,7 +94672,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +589,9 @@
+@@ -581,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88486,13 +94686,15 @@
mostlyclean-libtool:
--- kpresenter/toolbar/Makefile.in
+++ kpresenter/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88502,24 +94704,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88528,7 +94776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88540,46 +94788,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -809,9 +815,9 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-edit_picture.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-webpres.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-line_end.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-slide_effect.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-circle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+@@ -805,8 +814,8 @@
$(INSTALL_DATA) $(srcdir)/cr16-action-closed_cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-pgnum.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
-@@ -936,9 +942,9 @@
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
-+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
-- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/cubicbeziercurve.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-rectangle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/rectangle.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-quadricbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-circle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/circle.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-quadricbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-mini_polygon.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/mini_polygon.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(kpresentericondir)/crystalsvg/48x48/actions/effect.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-closed_freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/closed_freehand.png
+@@ -932,8 +941,8 @@
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/cubicbeziercurve.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/rectangle.png
+- -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/circle.png
++ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/mini_polygon.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/48x48/actions/effect.png
+ -rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/closed_freehand.png
--- krita/colorspaces/cmyk_u16/Makefile.in
+++ krita/colorspaces/cmyk_u16/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_cmyk_u16_plugin_la_SOURCES) $(libkrita_cmyk_u16_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -304,6 +302,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -302,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88589,24 +94828,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,6 +516,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -563,6 +566,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -613,7 +617,7 @@
+@@ -360,18 +364,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -426,8 +428,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -450,6 +455,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -531,6 +537,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -547,12 +554,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -609,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -88615,7 +94900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +655,9 @@
+@@ -647,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88629,22 +94914,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/cmyk_u8/Makefile.in
+++ krita/colorspaces/cmyk_u8/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacmykplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88654,24 +94932,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +601,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -88680,7 +95004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +639,9 @@
+@@ -631,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88694,13 +95018,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/cmyk_u8/templates/Makefile.in
+++ krita/colorspaces/cmyk_u8/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88710,24 +95036,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88736,7 +95108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88750,22 +95122,15 @@
mostlyclean-libtool:
--- krita/colorspaces/gray_u16/Makefile.in
+++ krita/colorspaces/gray_u16/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_gray_u16_plugin_la_SOURCES) $(libkrita_gray_u16_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -304,6 +302,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -302,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88775,24 +95140,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,6 +516,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -563,6 +566,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -614,7 +618,7 @@
+@@ -360,18 +364,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -426,8 +428,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -450,6 +455,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -531,6 +537,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -547,12 +554,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -88801,7 +95212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +656,9 @@
+@@ -648,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88815,22 +95226,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/gray_u8/Makefile.in
+++ krita/colorspaces/gray_u8/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritagrayplugin_la_SOURCES) $(libkritagrayscale_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -301,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88840,24 +95244,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,6 +515,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -562,6 +565,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -609,7 +613,7 @@
+@@ -359,18 +363,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -425,8 +427,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -449,6 +454,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -530,6 +536,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -546,12 +553,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -88866,7 +95316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +651,9 @@
+@@ -643,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88880,13 +95330,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/gray_u8/templates/Makefile.in
+++ krita/colorspaces/gray_u8/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88896,24 +95348,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -88922,7 +95420,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88936,22 +95434,15 @@
mostlyclean-libtool:
--- krita/colorspaces/gray_u8/tests/Makefile.in
+++ krita/colorspaces/gray_u8/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -263,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -88961,24 +95452,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,6 +477,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -524,6 +527,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -564,7 +568,7 @@
+@@ -321,18 +325,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +389,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -411,6 +416,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -492,6 +498,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -508,12 +515,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -88987,7 +95524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +606,9 @@
+@@ -598,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89001,22 +95538,15 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/lms_f32/Makefile.in
+++ krita/colorspaces/lms_f32/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_lms_f32_plugin_la_SOURCES) $(libkrita_lms_f32_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89026,24 +95556,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -600,7 +604,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89052,7 +95628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +642,9 @@
+@@ -634,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89066,13 +95642,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/Makefile.in
+++ krita/colorspaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -252,6 +252,9 @@
+@@ -115,6 +115,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89082,24 +95660,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,6 +466,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -511,6 +516,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -545,7 +551,7 @@
+@@ -310,18 +314,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,8 +378,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -400,6 +405,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -481,6 +487,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -497,12 +504,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -89108,7 +95732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +589,9 @@
+@@ -581,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89122,22 +95746,15 @@
mostlyclean-libtool:
--- krita/colorspaces/rgb_f16half/Makefile.in
+++ krita/colorspaces/rgb_f16half/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_rgb_f16half_plugin_la_SOURCES) $(libkrita_rgb_f16half_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -306,6 +304,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -304,6 +305,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89147,24 +95764,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,6 +518,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -565,6 +568,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -619,7 +623,7 @@
+@@ -362,18 +366,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -428,8 +430,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -452,6 +457,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -533,6 +539,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -549,12 +556,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -615,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89173,7 +95836,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +661,9 @@
+@@ -653,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89187,22 +95850,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_f16half/tests/Makefile.in
+++ krita/colorspaces/rgb_f16half/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -128,6 +128,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -265,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89212,24 +95868,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,6 +479,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -526,6 +529,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -568,7 +572,7 @@
+@@ -323,18 +327,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,8 +391,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -413,6 +418,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -494,6 +500,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -510,12 +517,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89238,7 +95940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +610,9 @@
+@@ -602,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89252,22 +95954,15 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_f32/Makefile.in
+++ krita/colorspaces/rgb_f32/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_rgb_f32_plugin_la_SOURCES) $(libkrita_rgb_f32_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -304,6 +302,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -302,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89277,24 +95972,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,6 +516,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -563,6 +566,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -616,7 +620,7 @@
+@@ -360,18 +364,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -426,8 +428,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -450,6 +455,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -531,6 +537,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -547,12 +554,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89303,7 +96044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +658,9 @@
+@@ -650,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89317,22 +96058,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_f32/tests/Makefile.in
+++ krita/colorspaces/rgb_f32/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -263,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89342,24 +96076,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,6 +477,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -524,6 +527,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -564,7 +568,7 @@
+@@ -321,18 +325,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +389,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -411,6 +416,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -492,6 +498,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -508,12 +515,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89368,7 +96148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +606,9 @@
+@@ -598,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89382,22 +96162,15 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_u16/Makefile.in
+++ krita/colorspaces/rgb_u16/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(krita_rgb_u16_plugin_la_SOURCES) $(libkrita_rgb_u16_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -304,6 +302,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -302,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89407,24 +96180,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,6 +516,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -563,6 +566,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -615,7 +619,7 @@
+@@ -360,18 +364,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -426,8 +428,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -450,6 +455,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -531,6 +537,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -547,12 +554,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89433,7 +96252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +657,9 @@
+@@ -649,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89447,22 +96266,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_u16/tests/Makefile.in
+++ krita/colorspaces/rgb_u16/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -263,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89472,24 +96284,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -476,6 +477,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -524,6 +527,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -564,7 +568,7 @@
+@@ -321,18 +325,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +389,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -411,6 +416,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -492,6 +498,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -508,12 +515,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89498,7 +96356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +606,9 @@
+@@ -598,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89512,22 +96370,15 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_u8/Makefile.in
+++ krita/colorspaces/rgb_u8/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritargbplugin_la_SOURCES) $(libkritargb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -299,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89537,24 +96388,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,6 +513,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -560,6 +563,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -613,7 +617,7 @@
+@@ -357,18 +361,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -423,8 +425,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -447,6 +452,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -528,6 +534,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -544,12 +551,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -609,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89563,7 +96460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +655,9 @@
+@@ -647,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89577,13 +96474,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_u8/templates/Makefile.in
+++ krita/colorspaces/rgb_u8/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89593,24 +96492,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -89619,7 +96564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89633,22 +96578,15 @@
mostlyclean-libtool:
--- krita/colorspaces/rgb_u8/tests/Makefile.in
+++ krita/colorspaces/rgb_u8/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -128,6 +128,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -265,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89658,24 +96596,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,6 +479,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -526,6 +529,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -566,7 +570,7 @@
+@@ -323,18 +327,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,8 +391,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -413,6 +418,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -494,6 +500,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -510,12 +517,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -562,7 +571,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -89684,7 +96668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +608,9 @@
+@@ -600,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89698,22 +96682,15 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/wet/Makefile.in
+++ krita/colorspaces/wet/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritawetplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89723,24 +96700,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -601,7 +605,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89749,7 +96772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +643,9 @@
+@@ -635,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89763,22 +96786,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/wetsticky/brushop/Makefile.in
+++ krita/colorspaces/wetsticky/brushop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritawsbrushpaintop_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89788,24 +96804,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89814,7 +96876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89828,22 +96890,15 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/wetsticky/Makefile.in
+++ krita/colorspaces/wetsticky/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritawsplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -299,6 +297,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -297,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89853,24 +96908,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,6 +511,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -558,6 +561,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -355,18 +359,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -421,8 +423,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -445,6 +450,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -526,6 +532,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -542,12 +549,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -89879,7 +96980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89893,22 +96994,15 @@
@$(NORMAL_INSTALL)
--- krita/core/Makefile.in
+++ krita/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritaimage_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -341,6 +339,9 @@
+@@ -202,6 +202,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -339,6 +340,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89918,24 +97012,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,6 +553,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -600,6 +603,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -693,7 +697,7 @@
+@@ -397,18 +401,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -463,8 +465,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -487,6 +492,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -568,6 +574,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -584,12 +591,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -689,7 +698,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -89944,7 +97084,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -731,9 +735,9 @@
+@@ -727,9 +736,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89958,22 +97098,15 @@
@$(NORMAL_INSTALL)
--- krita/core/tests/Makefile.in
+++ krita/core/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_filter_configuration_tester_la_SOURCES) $(kunittest_kis_image_tester_la_SOURCES) $(kunittest_kis_integer_maths_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -89983,24 +97116,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -90009,7 +97188,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90023,22 +97202,15 @@
clean-checkLTLIBRARIES:
--- krita/core/tiles/Makefile.in
+++ krita/core/tiles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritatile_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -299,6 +297,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -297,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90048,24 +97220,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,6 +511,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -558,6 +561,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +603,7 @@
+@@ -355,18 +359,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -421,8 +423,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -445,6 +450,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -526,6 +532,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -542,12 +549,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -90074,7 +97292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90088,22 +97306,15 @@
clean-noinstLTLIBRARIES:
--- krita/core/tiles/tests/Makefile.in
+++ krita/core/tiles/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_tiled_data_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -127,6 +127,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -264,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90113,24 +97324,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,6 +478,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -525,6 +528,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -564,7 +568,7 @@
+@@ -322,18 +326,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,8 +390,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -412,6 +417,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -493,6 +499,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -509,12 +516,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -90139,7 +97396,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +606,9 @@
+@@ -598,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90153,13 +97410,15 @@
clean-checkLTLIBRARIES:
--- krita/data/brushes/Makefile.in
+++ krita/data/brushes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90169,24 +97428,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -597,7 +603,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90195,7 +97500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90209,13 +97514,15 @@
mostlyclean-libtool:
--- krita/data/gradients/Makefile.in
+++ krita/data/gradients/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90225,24 +97532,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -557,7 +563,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90251,7 +97604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -593,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90265,13 +97618,15 @@
mostlyclean-libtool:
--- krita/data/images/Makefile.in
+++ krita/data/images/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90281,24 +97636,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -532,7 +538,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -530,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90307,7 +97708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +576,9 @@
+@@ -568,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90321,13 +97722,15 @@
mostlyclean-libtool:
--- krita/data/Makefile.in
+++ krita/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -259,6 +259,9 @@
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -259,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90337,24 +97740,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,6 +473,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -518,6 +523,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -551,7 +557,7 @@
+@@ -317,18 +321,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,8 +385,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -407,6 +412,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -488,6 +494,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -504,12 +511,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -90363,7 +97812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -587,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90377,13 +97826,15 @@
mostlyclean-libtool:
--- krita/data/palettes/Makefile.in
+++ krita/data/palettes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90393,24 +97844,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -578,7 +584,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90419,7 +97916,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +622,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90433,13 +97930,15 @@
mostlyclean-libtool:
--- krita/data/patterns/Makefile.in
+++ krita/data/patterns/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90449,24 +97948,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90475,7 +98020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90489,13 +98034,15 @@
mostlyclean-libtool:
--- krita/data/profiles/Makefile.in
+++ krita/data/profiles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90505,24 +98052,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90531,7 +98124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90545,13 +98138,15 @@
mostlyclean-libtool:
--- krita/dtd/Makefile.in
+++ krita/dtd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90561,24 +98156,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90587,7 +98228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90601,22 +98242,15 @@
mostlyclean-libtool:
--- krita/kritacolor/colorspaces/Makefile.in
+++ krita/kritacolor/colorspaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritacolorspaces_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -272,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90626,24 +98260,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,6 +486,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -533,6 +536,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -576,7 +580,7 @@
+@@ -330,18 +334,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -396,8 +398,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -420,6 +425,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -501,6 +507,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -517,12 +524,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -90652,7 +98332,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -610,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90666,22 +98346,15 @@
clean-noinstLTLIBRARIES:
--- krita/kritacolor/Makefile.in
+++ krita/kritacolor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkritacolor_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -319,6 +317,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -317,6 +318,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90691,24 +98364,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,6 +531,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -578,6 +581,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -646,7 +650,7 @@
+@@ -375,18 +379,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -441,8 +443,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -465,6 +470,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -546,6 +552,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -562,12 +569,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -642,7 +651,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -90717,7 +98436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +688,9 @@
+@@ -680,9 +689,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90731,22 +98450,15 @@
@$(NORMAL_INSTALL)
--- krita/kritacolor/tests/Makefile.in
+++ krita/kritacolor/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_kis_color_conversions_tester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -127,6 +127,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -264,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90756,24 +98468,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,6 +478,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -525,6 +528,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -564,7 +568,7 @@
+@@ -322,18 +326,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,8 +390,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -412,6 +417,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -493,6 +499,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -509,12 +516,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -90782,7 +98540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +606,9 @@
+@@ -598,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90796,37 +98554,15 @@
clean-checkLTLIBRARIES:
--- krita/Makefile.in
+++ krita/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES)
--#>+ 1
--SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES) $(krita_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -121,8 +117,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
-+#>- $(libkritapart_la_SOURCES)
-+#>+ 2
- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
-- $(libkritapart_la_SOURCES)
-+ $(libkritapart_la_SOURCES) $(krita_SOURCES)
- #>- DIST_SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
- #>- $(libkritapart_la_SOURCES)
- #>+ 2
-@@ -332,6 +331,9 @@
+@@ -194,6 +194,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -331,6 +332,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90836,24 +98572,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,6 +545,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -591,6 +595,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -645,7 +650,7 @@
+@@ -389,18 +393,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -455,8 +457,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -479,6 +484,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -560,6 +566,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -576,12 +583,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -642,7 +651,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -90862,7 +98644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -683,9 +688,9 @@
+@@ -680,9 +689,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90876,13 +98658,15 @@
@$(NORMAL_INSTALL)
--- krita/pics/Makefile.in
+++ krita/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90892,24 +98676,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -545,7 +551,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -90918,7 +98748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +589,9 @@
+@@ -581,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90932,22 +98762,15 @@
mostlyclean-libtool:
--- krita/plugins/filters/bumpmap/Makefile.in
+++ krita/plugins/filters/bumpmap/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritabumpmap_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -90957,24 +98780,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -585,7 +589,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -90983,7 +98852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +627,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90997,22 +98866,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/cimg/Makefile.in
+++ krita/plugins/filters/cimg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacimg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91022,24 +98884,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91048,7 +98956,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91062,22 +98970,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/colorsfilters/Makefile.in
+++ krita/plugins/filters/colorsfilters/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacolorsfilters_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91087,24 +98988,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +603,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91113,7 +99060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91127,22 +99074,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/convolutionfilters/Makefile.in
+++ krita/plugins/filters/convolutionfilters/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaconvolutionfilters_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91152,24 +99092,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -605,7 +609,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91178,7 +99164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +647,9 @@
+@@ -639,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91192,22 +99178,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/cubismfilter/Makefile.in
+++ krita/plugins/filters/cubismfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacubismfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91217,24 +99196,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91243,7 +99268,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91257,22 +99282,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/embossfilter/Makefile.in
+++ krita/plugins/filters/embossfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaembossfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91282,24 +99300,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91308,7 +99372,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91322,22 +99386,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/example/Makefile.in
+++ krita/plugins/filters/example/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaexample_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91347,24 +99404,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -581,7 +585,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91373,7 +99476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +623,9 @@
+@@ -615,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91387,22 +99490,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/imageenhancement/Makefile.in
+++ krita/plugins/filters/imageenhancement/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaimageenhancement_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91412,24 +99508,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -91438,7 +99580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91452,13 +99594,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/Makefile.in
+++ krita/plugins/filters/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91468,24 +99612,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -549,7 +555,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -91494,7 +99684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +593,9 @@
+@@ -585,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91508,22 +99698,15 @@
mostlyclean-libtool:
--- krita/plugins/filters/oilpaintfilter/Makefile.in
+++ krita/plugins/filters/oilpaintfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaoilpaintfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91533,24 +99716,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91559,7 +99788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91573,22 +99802,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/pixelizefilter/Makefile.in
+++ krita/plugins/filters/pixelizefilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritapixelizefilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91598,24 +99820,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91624,7 +99892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91638,22 +99906,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/raindropsfilter/Makefile.in
+++ krita/plugins/filters/raindropsfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaraindropsfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91663,24 +99924,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91689,7 +99996,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91703,22 +100010,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/roundcorners/Makefile.in
+++ krita/plugins/filters/roundcorners/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaroundcornersfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91728,24 +100028,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91754,7 +100100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91768,22 +100114,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/smalltilesfilter/Makefile.in
+++ krita/plugins/filters/smalltilesfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritasmalltilesfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91793,24 +100132,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91819,7 +100204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91833,22 +100218,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/sobelfilter/Makefile.in
+++ krita/plugins/filters/sobelfilter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritasobelfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91858,24 +100236,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91884,7 +100308,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91898,22 +100322,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/threadtest/Makefile.in
+++ krita/plugins/filters/threadtest/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritathreadtest_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91923,24 +100340,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -580,7 +584,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -91949,7 +100412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +622,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91963,13 +100426,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/Makefile.in
+++ krita/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -91979,24 +100444,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -92005,7 +100516,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92019,22 +100530,15 @@
mostlyclean-libtool:
--- krita/plugins/paintops/defaultpaintops/Makefile.in
+++ krita/plugins/paintops/defaultpaintops/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritadefaultpaintops_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92044,24 +100548,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -608,7 +612,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92070,7 +100620,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +650,9 @@
+@@ -642,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92084,13 +100634,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/paintops/Makefile.in
+++ krita/plugins/paintops/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92100,24 +100652,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -538,7 +544,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -536,7 +545,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -92126,7 +100724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +582,9 @@
+@@ -574,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92140,22 +100738,15 @@
mostlyclean-libtool:
--- krita/plugins/paintops/smearybrush/Makefile.in
+++ krita/plugins/paintops/smearybrush/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritasmearybrush_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92165,24 +100756,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92191,7 +100828,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92205,22 +100842,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/defaulttools/Makefile.in
+++ krita/plugins/tools/defaulttools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritadefaulttools_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -289,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92230,24 +100860,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,6 +503,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -550,6 +553,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -664,7 +668,7 @@
+@@ -347,18 +351,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +415,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -437,6 +442,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -518,6 +524,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -534,12 +541,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -660,7 +669,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92256,7 +100932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -702,9 +706,9 @@
+@@ -698,9 +707,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92270,13 +100946,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/Makefile.in
+++ krita/plugins/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92286,24 +100964,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -545,7 +551,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -92312,7 +101036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +589,9 @@
+@@ -581,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92326,22 +101050,15 @@
mostlyclean-libtool:
--- krita/plugins/tools/selectiontools/Makefile.in
+++ krita/plugins/tools/selectiontools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaselectiontools_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92351,24 +101068,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -630,7 +634,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -626,7 +635,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92377,7 +101140,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +672,9 @@
+@@ -664,9 +673,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92391,22 +101154,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_crop/Makefile.in
+++ krita/plugins/tools/tool_crop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolcrop_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92416,24 +101172,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -603,7 +607,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92442,7 +101244,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +645,9 @@
+@@ -637,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92456,22 +101258,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_filter/Makefile.in
+++ krita/plugins/tools/tool_filter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolfilter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92481,24 +101276,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92507,7 +101348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92521,22 +101362,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_polygon/Makefile.in
+++ krita/plugins/tools/tool_polygon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolpolygon_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92546,24 +101380,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92572,7 +101452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92586,22 +101466,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_polyline/Makefile.in
+++ krita/plugins/tools/tool_polyline/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolpolyline_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92611,24 +101484,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -600,7 +604,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92637,7 +101556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +642,9 @@
+@@ -634,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92651,22 +101570,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_selectsimilar/Makefile.in
+++ krita/plugins/tools/tool_selectsimilar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolselectsimilar_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92676,24 +101588,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92702,7 +101660,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92716,22 +101674,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_star/Makefile.in
+++ krita/plugins/tools/tool_star/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatoolstar_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92741,24 +101692,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92767,7 +101764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92781,22 +101778,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_transform/Makefile.in
+++ krita/plugins/tools/tool_transform/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritatooltransform_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92806,24 +101796,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -605,7 +609,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92832,7 +101868,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +647,9 @@
+@@ -639,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92846,22 +101882,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/colorrange/Makefile.in
+++ krita/plugins/viewplugins/colorrange/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacolorrange_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92871,24 +101900,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92897,7 +101972,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92911,22 +101986,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/colorspaceconversion/Makefile.in
+++ krita/plugins/viewplugins/colorspaceconversion/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritacolorspaceconversion_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -92936,24 +102004,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -92962,7 +102076,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92976,22 +102090,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/dropshadow/Makefile.in
+++ krita/plugins/viewplugins/dropshadow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritadropshadow_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93001,24 +102108,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93027,7 +102180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93041,22 +102194,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/filtersgallery/Makefile.in
+++ krita/plugins/viewplugins/filtersgallery/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritafiltersgallery_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93066,24 +102212,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93092,7 +102284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93106,22 +102298,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/histogram/Makefile.in
+++ krita/plugins/viewplugins/histogram/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritahistogram_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93131,24 +102316,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93157,7 +102388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93171,22 +102402,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/histogram_docker/Makefile.in
+++ krita/plugins/viewplugins/histogram_docker/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritahistogramdocker_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -287,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93196,24 +102420,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,6 +501,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -548,6 +551,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -345,18 +349,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +413,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -435,6 +440,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -516,6 +522,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -532,12 +539,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93222,7 +102492,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93236,22 +102506,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/history_docker/Makefile.in
+++ krita/plugins/viewplugins/history_docker/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- #kde_services_DATA = kritahistorydocker.desktop
-
-
--SOURCES = $(kritahistorydocker_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93261,24 +102524,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,6 +490,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -537,6 +540,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -577,7 +581,7 @@
+@@ -334,18 +338,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -424,6 +429,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -505,6 +511,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -521,12 +528,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93287,7 +102596,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +619,9 @@
+@@ -611,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93301,22 +102610,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/imagesize/Makefile.in
+++ krita/plugins/viewplugins/imagesize/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaimagesize_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93326,24 +102628,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93352,7 +102700,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93366,13 +102714,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/Makefile.in
+++ krita/plugins/viewplugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -251,6 +251,9 @@
+@@ -114,6 +114,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93382,24 +102732,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,6 +465,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -510,6 +515,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -551,7 +557,7 @@
+@@ -309,18 +313,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +377,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -399,6 +404,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -480,6 +486,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -496,12 +503,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -93408,7 +102804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -587,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93422,22 +102818,15 @@
mostlyclean-libtool:
--- krita/plugins/viewplugins/performancetest/Makefile.in
+++ krita/plugins/viewplugins/performancetest/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaperftest_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93447,24 +102836,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93473,7 +102908,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93487,22 +102922,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/rotateimage/Makefile.in
+++ krita/plugins/viewplugins/rotateimage/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritarotateimage_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93512,24 +102940,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93538,7 +103012,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93552,22 +103026,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/screenshot/Makefile.in
+++ krita/plugins/viewplugins/screenshot/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritascreenshot_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93577,24 +103044,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -93603,7 +103116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93617,22 +103130,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
+++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(krosskritacore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -308,6 +306,9 @@
+@@ -169,6 +169,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -306,6 +307,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93642,24 +103148,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,6 +520,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -567,6 +570,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -620,7 +624,7 @@
+@@ -364,18 +368,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -430,8 +432,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -454,6 +459,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -535,6 +541,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -551,12 +558,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -93668,7 +103220,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +662,9 @@
+@@ -654,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93682,22 +103234,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
+++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritascripting_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93707,24 +103252,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -586,7 +590,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -93733,7 +103324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +628,9 @@
+@@ -620,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93747,22 +103338,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/Makefile.in
+++ krita/plugins/viewplugins/scripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritascripting_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -296,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93772,24 +103356,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,6 +510,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -557,6 +560,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -604,7 +608,7 @@
+@@ -354,18 +358,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -420,8 +422,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -444,6 +449,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -525,6 +531,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -541,12 +548,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -93798,7 +103428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +646,9 @@
+@@ -638,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93812,13 +103442,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/samples/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93828,24 +103460,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -93854,7 +103532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93868,13 +103546,15 @@
mostlyclean-libtool:
--- krita/plugins/viewplugins/scripting/samples/python/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/python/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -239,6 +239,9 @@
+@@ -102,6 +102,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -239,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93884,24 +103564,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,6 +453,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -498,6 +503,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -528,7 +534,7 @@
+@@ -297,18 +301,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,8 +365,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -387,6 +392,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -468,6 +474,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -484,12 +491,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -526,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -93910,7 +103636,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +572,9 @@
+@@ -564,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93924,13 +103650,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -93940,24 +103668,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -547,7 +553,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -93966,7 +103740,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +591,9 @@
+@@ -583,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93980,22 +103754,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/separate_channels/Makefile.in
+++ krita/plugins/viewplugins/separate_channels/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritaseparatechannels_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -285,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94005,24 +103772,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,6 +499,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -546,6 +549,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -599,7 +603,7 @@
+@@ -343,18 +347,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,8 +411,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -433,6 +438,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -514,6 +520,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -530,12 +537,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94031,7 +103844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +641,9 @@
+@@ -633,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94045,22 +103858,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/shearimage/Makefile.in
+++ krita/plugins/viewplugins/shearimage/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritashearimage_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94070,24 +103876,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -589,7 +593,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94096,7 +103948,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +631,9 @@
+@@ -623,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94110,22 +103962,15 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/variations/Makefile.in
+++ krita/plugins/viewplugins/variations/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritavariations_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94135,24 +103980,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94161,7 +104052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94175,22 +104066,15 @@
@$(NORMAL_INSTALL)
--- krita/sdk/Makefile.in
+++ krita/sdk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritasdk_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -276,6 +274,9 @@
+@@ -137,6 +137,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -274,6 +275,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94200,24 +104084,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,6 +488,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -535,6 +538,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -332,18 +336,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -398,8 +400,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -422,6 +427,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -503,6 +509,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -519,12 +526,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94226,7 +104156,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94240,22 +104170,15 @@
clean-noinstLTLIBRARIES:
--- krita/ui/Makefile.in
+++ krita/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkritaui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -346,6 +344,9 @@
+@@ -207,6 +207,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -344,6 +345,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94265,24 +104188,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,6 +558,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -605,6 +608,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -735,7 +739,7 @@
+@@ -402,18 +406,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -468,8 +470,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -492,6 +497,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -573,6 +579,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -589,12 +596,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -731,7 +740,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -94291,7 +104260,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -773,9 +777,9 @@
+@@ -769,9 +778,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94305,22 +104274,15 @@
@$(NORMAL_INSTALL)
--- kspread/dialogs/Makefile.in
+++ kspread/dialogs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libdialogs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94330,24 +104292,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -693,7 +697,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -689,7 +698,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94356,7 +104364,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -731,9 +735,9 @@
+@@ -727,9 +736,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94370,13 +104378,15 @@
clean-noinstLTLIBRARIES:
--- kspread/dtd/Makefile.in
+++ kspread/dtd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94386,24 +104396,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94412,7 +104468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94426,13 +104482,15 @@
mostlyclean-libtool:
--- kspread/extensions/Makefile.in
+++ kspread/extensions/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94442,24 +104500,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -533,7 +539,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -531,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94468,7 +104572,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +577,9 @@
+@@ -569,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94482,37 +104586,15 @@
mostlyclean-libtool:
--- kspread/Makefile.in
+++ kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -167,8 +163,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
-+#>- $(libkspreadpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
-- $(libkspreadpart_la_SOURCES)
-+ $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
- #>- DIST_SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
- #>- $(libkspreadpart_la_SOURCES)
- #>+ 2
-@@ -379,6 +378,9 @@
+@@ -241,6 +241,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -378,6 +379,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94522,24 +104604,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,6 +592,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -638,6 +642,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -740,7 +745,7 @@
+@@ -436,18 +440,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -502,8 +504,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -526,6 +531,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -607,6 +613,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -623,12 +630,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -737,7 +746,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -94548,7 +104676,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -778,9 +783,9 @@
+@@ -775,9 +784,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94562,13 +104690,15 @@
@$(NORMAL_INSTALL)
--- kspread/pics/Makefile.in
+++ kspread/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94578,24 +104708,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94604,7 +104780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94618,22 +104794,15 @@
mostlyclean-libtool:
--- kspread/plugins/calculator/Makefile.in
+++ kspread/plugins/calculator/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkspreadcalc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -293,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94643,24 +104812,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,6 +507,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -554,6 +557,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -598,7 +602,7 @@
+@@ -351,18 +355,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -417,8 +419,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -441,6 +446,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -522,6 +528,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -538,12 +545,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -94669,7 +104884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +640,9 @@
+@@ -632,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94683,13 +104898,15 @@
@$(NORMAL_INSTALL)
--- kspread/plugins/calculator/pics/Makefile.in
+++ kspread/plugins/calculator/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94699,24 +104916,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94725,7 +104988,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94739,22 +105002,15 @@
mostlyclean-libtool:
--- kspread/plugins/insertcalendar/Makefile.in
+++ kspread/plugins/insertcalendar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkspreadinsertcalendar_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94764,24 +105020,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -606,7 +610,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -94790,7 +105092,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +648,9 @@
+@@ -640,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94804,13 +105106,15 @@
@$(NORMAL_INSTALL)
--- kspread/plugins/Makefile.in
+++ kspread/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94820,24 +105124,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -94846,7 +105196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94860,13 +105210,15 @@
mostlyclean-libtool:
--- kspread/sheetstyles/Makefile.in
+++ kspread/sheetstyles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94876,24 +105228,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94902,7 +105300,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94916,13 +105314,15 @@
mostlyclean-libtool:
--- kspread/templates/Business/Makefile.in
+++ kspread/templates/Business/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94932,24 +105332,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -94958,7 +105404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94972,13 +105418,15 @@
mostlyclean-libtool:
--- kspread/templates/General/Makefile.in
+++ kspread/templates/General/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -94988,24 +105436,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95014,7 +105508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95028,13 +105522,15 @@
mostlyclean-libtool:
--- kspread/templates/HomeFamily/Makefile.in
+++ kspread/templates/HomeFamily/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95044,24 +105540,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -536,7 +542,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -534,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95070,7 +105612,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +580,9 @@
+@@ -572,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95084,13 +105626,15 @@
mostlyclean-libtool:
--- kspread/templates/Makefile.in
+++ kspread/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95100,24 +105644,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -95126,7 +105716,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95140,22 +105730,15 @@
mostlyclean-libtool:
--- kspread/tests/Makefile.in
+++ kspread/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libtests_la_SOURCES) $(formulatest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95165,24 +105748,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -593,7 +597,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -95191,7 +105820,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -627,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95205,13 +105834,15 @@
clean-noinstLTLIBRARIES:
--- kspread/toolbar/crystalsvg/Makefile.in
+++ kspread/toolbar/crystalsvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95221,24 +105852,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95247,7 +105924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95261,13 +105938,15 @@
mostlyclean-libtool:
--- kspread/toolbar/Makefile.in
+++ kspread/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95277,24 +105956,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -95303,7 +106028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95317,37 +106042,15 @@
mostlyclean-libtool:
--- kugar/kudesigner/Makefile.in
+++ kugar/kudesigner/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) $(libkudesignerpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) $(libkudesignerpart_la_SOURCES) $(kudesigner_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -127,8 +123,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) \
-+#>- $(libkudesignerpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) \
-- $(libkudesignerpart_la_SOURCES)
-+ $(libkudesignerpart_la_SOURCES) $(kudesigner_SOURCES)
- #>- DIST_SOURCES = $(kudesigner_la_SOURCES) \
- #>- $(libkudesignercore_la_SOURCES) \
- #>- $(libkudesignerpart_la_SOURCES)
-@@ -339,6 +338,9 @@
+@@ -201,6 +201,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -338,6 +339,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95357,24 +106060,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,6 +552,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -598,6 +602,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -663,7 +668,7 @@
+@@ -396,18 +400,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -462,8 +464,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -486,6 +491,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -567,6 +573,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -583,12 +590,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -660,7 +669,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -95383,7 +106132,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +706,9 @@
+@@ -698,9 +707,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95397,13 +106146,15 @@
@$(NORMAL_INSTALL)
--- kugar/kudesigner/pics/Makefile.in
+++ kugar/kudesigner/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95413,24 +106164,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95439,7 +106236,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95453,13 +106250,15 @@
mostlyclean-libtool:
--- kugar/kudesigner/templates/General/Makefile.in
+++ kugar/kudesigner/templates/General/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95469,24 +106268,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -545,7 +551,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95495,7 +106340,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +589,9 @@
+@@ -581,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95509,13 +106354,15 @@
mostlyclean-libtool:
--- kugar/kudesigner/templates/Makefile.in
+++ kugar/kudesigner/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95525,24 +106372,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -95551,7 +106444,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95565,13 +106458,15 @@
mostlyclean-libtool:
--- kugar/kudesigner/toolbar/Makefile.in
+++ kugar/kudesigner/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95581,24 +106476,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95607,7 +106548,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95621,22 +106562,15 @@
mostlyclean-libtool:
--- kugar/kudesigner_lib/Makefile.in
+++ kugar/kudesigner_lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkudesignercommon_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -276,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95646,24 +106580,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,6 +490,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -537,6 +540,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -579,7 +583,7 @@
+@@ -334,18 +338,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,8 +402,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -424,6 +429,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -505,6 +511,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -521,12 +528,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -95672,7 +106652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95686,22 +106666,15 @@
clean-noinstLTLIBRARIES:
--- kugar/lib/Makefile.in
+++ kugar/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkugarlib_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95711,24 +106684,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -593,7 +597,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -95737,7 +106756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +635,9 @@
+@@ -627,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95751,13 +106770,15 @@
@$(NORMAL_INSTALL)
--- kugar/Makefile.in
+++ kugar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -250,6 +250,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -250,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95767,24 +106788,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,6 +464,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -509,6 +514,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -539,7 +545,7 @@
+@@ -308,18 +312,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,8 +376,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -398,6 +403,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -479,6 +485,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -495,12 +502,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -537,7 +546,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -95793,7 +106860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -575,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95807,35 +106874,15 @@
mostlyclean-libtool:
--- kugar/part/Makefile.in
+++ kugar/part/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -119,7 +115,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
-+#>- SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
- #>- DIST_SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
-@@ -314,6 +312,9 @@
+@@ -175,6 +175,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -312,6 +313,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95845,24 +106892,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,6 +526,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -573,6 +576,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -629,7 +633,7 @@
+@@ -370,18 +374,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -436,8 +438,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -460,6 +465,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -541,6 +547,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -557,12 +564,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -625,7 +634,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -95871,7 +106964,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +671,9 @@
+@@ -663,9 +672,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95885,13 +106978,15 @@
@$(NORMAL_INSTALL)
--- kugar/samples/Makefile.in
+++ kugar/samples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95901,24 +106996,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -531,7 +537,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -529,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95927,7 +107068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +575,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95941,13 +107082,15 @@
mostlyclean-libtool:
--- kword/data/Makefile.in
+++ kword/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -95957,24 +107100,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -95983,7 +107172,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95997,13 +107186,15 @@
mostlyclean-libtool:
--- kword/dtd/Makefile.in
+++ kword/dtd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -247,6 +247,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -247,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96013,24 +107204,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,6 +461,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -506,6 +511,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -305,18 +309,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -371,8 +373,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -395,6 +400,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -476,6 +482,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -492,12 +499,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96039,7 +107276,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96053,13 +107290,15 @@
mostlyclean-libtool:
--- kword/expression/Makefile.in
+++ kword/expression/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96069,24 +107308,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96095,7 +107380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96109,13 +107394,15 @@
mostlyclean-libtool:
--- kword/horizontalline/Makefile.in
+++ kword/horizontalline/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96125,24 +107412,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96151,7 +107484,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96165,22 +107498,15 @@
mostlyclean-libtool:
--- kword/mailmerge/kabc/Makefile.in
+++ kword/mailmerge/kabc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwmailmerge_kabc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96190,24 +107516,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96216,7 +107588,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96230,22 +107602,15 @@
@$(NORMAL_INSTALL)
--- kword/mailmerge/kspread/Makefile.in
+++ kword/mailmerge/kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwmailmerge_kspread_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -284,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96255,24 +107620,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,6 +498,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -545,6 +548,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -585,7 +589,7 @@
+@@ -342,18 +346,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,8 +410,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -432,6 +437,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -513,6 +519,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -529,12 +536,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96281,7 +107692,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +627,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96295,22 +107706,15 @@
@$(NORMAL_INSTALL)
--- kword/mailmerge/Makefile.in
+++ kword/mailmerge/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwmailmerge_classic_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -291,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96320,24 +107724,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,6 +505,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -552,6 +555,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -349,18 +353,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,8 +417,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -439,6 +444,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -520,6 +526,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -536,12 +543,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96346,7 +107796,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96360,22 +107810,15 @@
@$(NORMAL_INSTALL)
--- kword/mailmerge/sql/Makefile.in
+++ kword/mailmerge/sql/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwmailmerge_qtsqldb_la_SOURCES) $(kwmailmerge_qtsqldb_power_la_SOURCES) $(libmailmergesqlcommon_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -310,6 +308,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -308,6 +309,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96385,24 +107828,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,6 +522,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -569,6 +572,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -626,7 +630,7 @@
+@@ -366,18 +370,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -432,8 +434,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -456,6 +461,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -537,6 +543,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -553,12 +560,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96411,7 +107900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -664,9 +668,9 @@
+@@ -660,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96425,37 +107914,15 @@
@$(NORMAL_INSTALL)
--- kword/Makefile.in
+++ kword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
--#>+ 1
--SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -185,8 +181,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
-+#>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-+#>+ 2
- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
-- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-+ $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
- #>- DIST_SOURCES = $(kword_la_SOURCES) \
- #>- $(libkwmailmerge_interface_la_SOURCES) \
- #>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-@@ -402,6 +401,9 @@
+@@ -264,6 +264,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -401,6 +402,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96465,24 +107932,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,6 +615,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -661,6 +665,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -809,7 +814,7 @@
+@@ -459,18 +463,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -525,8 +527,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -549,6 +554,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -630,6 +636,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -646,12 +653,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -806,7 +815,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96491,7 +108004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -847,9 +852,9 @@
+@@ -844,9 +853,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96505,13 +108018,15 @@
@$(NORMAL_INSTALL)
--- kword/pics/Makefile.in
+++ kword/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96521,24 +108036,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -519,7 +525,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96547,7 +108108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +563,9 @@
+@@ -555,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96561,13 +108122,15 @@
mostlyclean-libtool:
--- kword/templates/CardsAndLabels/Makefile.in
+++ kword/templates/CardsAndLabels/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96577,24 +108140,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96603,7 +108212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96617,13 +108226,15 @@
mostlyclean-libtool:
--- kword/templates/Envelopes/Makefile.in
+++ kword/templates/Envelopes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96633,24 +108244,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96659,7 +108316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96673,13 +108330,15 @@
mostlyclean-libtool:
--- kword/templates/Makefile.in
+++ kword/templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96689,24 +108348,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -96715,7 +108420,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96729,13 +108434,15 @@
mostlyclean-libtool:
--- kword/templates/Wordprocessing/Makefile.in
+++ kword/templates/Wordprocessing/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96745,24 +108452,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -543,7 +549,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96771,7 +108524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96785,22 +108538,15 @@
mostlyclean-libtool:
--- kword/tests/Makefile.in
+++ kword/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_FrameTester_la_SOURCES) $(kunittest_FrameViewTester_la_SOURCES) $(kunittest_KWPageManagerTester_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -278,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96810,24 +108556,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,6 +492,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -539,6 +542,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -584,7 +588,7 @@
+@@ -336,18 +340,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,8 +404,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -426,6 +431,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -507,6 +513,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -523,12 +530,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -96836,7 +108628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +626,9 @@
+@@ -618,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96850,13 +108642,15 @@
clean-checkLTLIBRARIES:
--- kword/toolbar/Makefile.in
+++ kword/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96866,24 +108660,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96892,7 +108732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96906,13 +108746,15 @@
mostlyclean-libtool:
--- lib/kformula/config/Makefile.in
+++ lib/kformula/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96922,24 +108764,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -554,7 +560,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -552,7 +561,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -96948,7 +108836,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +598,9 @@
+@@ -590,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -96962,13 +108850,15 @@
mostlyclean-libtool:
--- lib/kformula/dtd/Makefile.in
+++ lib/kformula/dtd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -96978,24 +108868,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97004,7 +108940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97018,13 +108954,15 @@
mostlyclean-libtool:
--- lib/kformula/fonts/Makefile.in
+++ lib/kformula/fonts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97034,24 +108972,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -531,7 +537,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -529,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97060,7 +109044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +575,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97074,22 +109058,15 @@
mostlyclean-libtool:
--- lib/kformula/Makefile.in
+++ lib/kformula/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkformulalib_la_SOURCES) $(kformulatest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -322,6 +320,9 @@
+@@ -183,6 +183,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -320,6 +321,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97099,24 +109076,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,6 +534,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -581,6 +584,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -636,7 +640,7 @@
+@@ -378,18 +382,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -444,8 +446,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -468,6 +473,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -549,6 +555,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -565,12 +572,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -632,7 +641,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -97125,7 +109148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +678,9 @@
+@@ -670,9 +679,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97139,13 +109162,15 @@
@$(NORMAL_INSTALL)
--- lib/kformula/pics/crystalsvg/Makefile.in
+++ lib/kformula/pics/crystalsvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97155,24 +109180,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97181,7 +109252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97195,13 +109266,15 @@
mostlyclean-libtool:
--- lib/kformula/pics/Makefile.in
+++ lib/kformula/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97211,24 +109284,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -97237,7 +109356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97251,22 +109370,15 @@
mostlyclean-libtool:
--- lib/kofficecore/Makefile.in
+++ lib/kofficecore/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(kodocinfopropspage_la_SOURCES) $(libkofficecore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -342,6 +340,9 @@
+@@ -203,6 +203,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -340,6 +341,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97276,24 +109388,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,6 +554,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -601,6 +604,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -716,7 +720,7 @@
+@@ -398,18 +402,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -464,8 +466,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -488,6 +493,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -569,6 +575,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -585,12 +592,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -712,7 +721,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -97302,7 +109460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -754,9 +758,9 @@
+@@ -750,9 +759,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97316,22 +109474,15 @@
@$(NORMAL_INSTALL)
--- lib/kofficecore/tests/Makefile.in
+++ lib/kofficecore/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
- ####### General stuff
--SOURCES = $(filter_graph_SOURCES) $(filterchain_test_SOURCES) $(kodomtest_SOURCES) $(kogenstylestest_SOURCES) $(kooasissettingstest_SOURCES) $(kooasisstoretest_SOURCES) $(kopointtest_SOURCES) $(korecttest_SOURCES) $(priorityqueue_test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -318,6 +316,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -316,6 +317,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97341,24 +109492,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,6 +530,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -577,6 +580,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -624,7 +628,7 @@
+@@ -374,18 +378,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -440,8 +442,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -464,6 +469,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -545,6 +551,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -561,12 +568,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -97367,7 +109564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +666,9 @@
+@@ -658,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97381,22 +109578,15 @@
clean-checkPROGRAMS:
--- lib/kofficeui/Makefile.in
+++ lib/kofficeui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ###### General stuff
-
-
--SOURCES = $(libkofficeui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -321,6 +319,9 @@
+@@ -182,6 +182,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -319,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97406,24 +109596,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,6 +533,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -580,6 +583,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -679,7 +683,7 @@
+@@ -377,18 +381,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -443,8 +445,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -467,6 +472,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -548,6 +554,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -564,12 +571,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -675,7 +684,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -97432,7 +109668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -717,9 +721,9 @@
+@@ -713,9 +722,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97446,13 +109682,15 @@
@$(NORMAL_INSTALL)
--- lib/kofficeui/pics/Makefile.in
+++ lib/kofficeui/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -245,6 +245,9 @@
+@@ -108,6 +108,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -245,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97462,24 +109700,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,6 +459,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -504,6 +509,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -540,7 +546,7 @@
+@@ -303,18 +307,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +371,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -393,6 +398,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -474,6 +480,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -490,12 +497,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97488,7 +109772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -576,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97502,13 +109786,15 @@
mostlyclean-libtool:
--- lib/kofficeui/tests/Makefile.in
+++ lib/kofficeui/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -236,6 +236,9 @@
+@@ -99,6 +99,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -236,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97518,24 +109804,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,6 +450,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -495,6 +500,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -526,7 +532,7 @@
+@@ -294,18 +298,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +362,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -384,6 +389,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -465,6 +471,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -481,12 +488,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -524,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97544,7 +109876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +570,9 @@
+@@ -562,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97558,22 +109890,15 @@
clean-checkPROGRAMS:
--- lib/kopainter/Makefile.in
+++ lib/kopainter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkopainter_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97583,24 +109908,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -591,7 +595,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -97609,7 +109980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +633,9 @@
+@@ -625,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97623,22 +109994,15 @@
@$(NORMAL_INSTALL)
--- lib/kopalette/Makefile.in
+++ lib/kopalette/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkopalette_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -281,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97648,24 +110012,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,6 +495,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -542,6 +545,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -339,18 +343,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -405,8 +407,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -429,6 +434,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -510,6 +516,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -526,12 +533,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -97674,7 +110084,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97688,22 +110098,15 @@
@$(NORMAL_INSTALL)
--- lib/koproperty/editors/Makefile.in
+++ lib/koproperty/editors/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkopropertyeditors_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -293,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97713,24 +110116,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,6 +507,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -554,6 +557,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -351,18 +355,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -417,8 +419,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -441,6 +446,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -522,6 +528,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -538,12 +545,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -97739,7 +110188,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97753,22 +110202,15 @@
clean-noinstLTLIBRARIES:
--- lib/koproperty/Makefile.in
+++ lib/koproperty/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkoproperty_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97778,24 +110220,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -594,7 +598,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -97804,7 +110292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +636,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97818,22 +110306,15 @@
@$(NORMAL_INSTALL)
--- lib/koproperty/test/Makefile.in
+++ lib/koproperty/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(propertytest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -271,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97843,24 +110324,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,6 +485,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -532,6 +535,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -571,7 +575,7 @@
+@@ -329,18 +333,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,8 +397,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -419,6 +424,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -500,6 +506,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -516,12 +523,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -567,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -97869,7 +110396,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +613,9 @@
+@@ -605,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97883,13 +110410,15 @@
clean-noinstPROGRAMS:
--- lib/kotext/kohyphen/hyphdicts/Makefile.in
+++ lib/kotext/kohyphen/hyphdicts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97899,24 +110428,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -531,7 +537,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -529,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -97925,7 +110500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +575,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -97939,22 +110514,15 @@
mostlyclean-libtool:
--- lib/kotext/kohyphen/Makefile.in
+++ lib/kotext/kohyphen/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkohyphen_la_SOURCES) $(kohyphentest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -299,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -97964,24 +110532,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,6 +513,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -560,6 +563,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -602,7 +606,7 @@
+@@ -357,18 +361,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -423,8 +425,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -447,6 +452,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -528,6 +534,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -544,12 +551,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -97990,7 +110604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +644,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98004,22 +110618,15 @@
clean-noinstLTLIBRARIES:
--- lib/kotext/Makefile.in
+++ lib/kotext/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkotext_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -322,6 +320,9 @@
+@@ -183,6 +183,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -320,6 +321,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98029,24 +110636,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,6 +534,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -581,6 +584,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -651,7 +655,7 @@
+@@ -378,18 +382,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -444,8 +446,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -468,6 +473,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -549,6 +555,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -565,12 +572,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -647,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -98055,7 +110708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -689,9 +693,9 @@
+@@ -685,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98069,22 +110722,15 @@
@$(NORMAL_INSTALL)
--- lib/kotext/tests/Makefile.in
+++ lib/kotext/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--SOURCES = $(kunittest_KoUserStyleTester_la_SOURCES) $(kobordertest_SOURCES) $(kotextformattertest_SOURCES) $(kovariabletest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -286,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98094,24 +110740,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,6 +500,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -547,6 +550,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -587,7 +591,7 @@
+@@ -344,18 +348,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,8 +412,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -434,6 +439,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -515,6 +521,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -531,12 +538,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98120,7 +110812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +629,9 @@
+@@ -621,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98134,22 +110826,15 @@
clean-checkLTLIBRARIES:
--- lib/kross/api/Makefile.in
+++ lib/kross/api/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkrossapi_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -302,6 +300,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -300,6 +301,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98159,24 +110844,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,6 +514,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -561,6 +564,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -635,7 +639,7 @@
+@@ -358,18 +362,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -424,8 +426,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -448,6 +453,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -529,6 +535,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -545,12 +552,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -631,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98185,7 +110916,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +677,9 @@
+@@ -669,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98199,22 +110930,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/main/Makefile.in
+++ lib/kross/main/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkrossmain_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -301,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98224,24 +110948,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,6 +515,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -562,6 +565,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -622,7 +626,7 @@
+@@ -359,18 +363,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -425,8 +427,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -449,6 +454,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -530,6 +536,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -546,12 +553,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -618,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98250,7 +111020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +664,9 @@
+@@ -656,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98264,13 +111034,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/Makefile.in
+++ lib/kross/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98280,24 +111052,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -548,7 +554,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -98306,7 +111124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +592,9 @@
+@@ -584,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98320,22 +111138,15 @@
mostlyclean-libtool:
--- lib/kross/python/CXX/Makefile.in
+++ lib/kross/python/CXX/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkrosspythoncxx_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -291,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98345,24 +111156,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,6 +505,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -552,6 +555,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -349,18 +353,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,8 +417,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -439,6 +444,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -520,6 +526,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -536,12 +543,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .c .cxx .lo .o .obj
@@ -98371,7 +111228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98385,22 +111242,15 @@
clean-noinstLTLIBRARIES:
--- lib/kross/python/Makefile.in
+++ lib/kross/python/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(krosspython_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -298,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98410,24 +111260,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,6 +512,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -559,6 +562,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -617,7 +621,7 @@
+@@ -356,18 +360,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,8 +424,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -446,6 +451,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -527,6 +533,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -543,12 +550,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98436,7 +111332,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +659,9 @@
+@@ -651,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98450,13 +111346,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/python/scripts/Makefile.in
+++ lib/kross/python/scripts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -253,6 +253,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -253,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98466,24 +111364,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,6 +467,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -512,6 +517,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -541,7 +547,7 @@
+@@ -311,18 +315,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,8 +379,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -401,6 +406,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -482,6 +488,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -498,12 +505,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -539,7 +548,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -98492,7 +111436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -577,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98506,13 +111450,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/python/scripts/RestrictedPython/Makefile.in
+++ lib/kross/python/scripts/RestrictedPython/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -237,6 +237,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -237,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98522,24 +111468,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,6 +451,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -496,6 +501,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -527,7 +533,7 @@
+@@ -295,18 +299,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,8 +363,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -385,6 +390,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -466,6 +472,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -482,12 +489,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -525,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -98548,7 +111540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +571,9 @@
+@@ -563,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98562,22 +111554,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/ruby/Makefile.in
+++ lib/kross/ruby/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(krossruby_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -282,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98587,24 +111572,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,6 +496,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -543,6 +546,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -584,7 +588,7 @@
+@@ -340,18 +344,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +408,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -430,6 +435,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -511,6 +517,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -527,12 +534,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98613,7 +111644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +626,9 @@
+@@ -618,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98627,22 +111658,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/runner/Makefile.in
+++ lib/kross/runner/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(krossrunner_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98652,24 +111676,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -579,7 +583,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98678,7 +111748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -613,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98692,22 +111762,15 @@
@$(NORMAL_INSTALL)
--- lib/kross/test/Makefile.in
+++ lib/kross/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(krosstest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -288,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98717,24 +111780,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,6 +502,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -549,6 +552,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -590,7 +594,7 @@
+@@ -346,18 +350,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,8 +414,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -436,6 +441,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -517,6 +523,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -533,12 +540,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98743,7 +111852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +632,9 @@
+@@ -624,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98757,22 +111866,15 @@
clean-noinstPROGRAMS:
--- lib/kwmf/Makefile.in
+++ lib/kwmf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkowmf_la_SOURCES) $(libkwmf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -290,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98782,24 +111884,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,6 +504,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -551,6 +554,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -596,7 +600,7 @@
+@@ -348,18 +352,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +416,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -438,6 +443,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -519,6 +525,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -535,12 +542,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -98808,7 +111956,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +638,9 @@
+@@ -630,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98822,13 +111970,15 @@
@$(NORMAL_INSTALL)
--- lib/Makefile.in
+++ lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -251,6 +251,9 @@
+@@ -114,6 +114,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -251,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98838,24 +111988,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,6 +465,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -510,6 +515,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -546,7 +552,7 @@
+@@ -309,18 +313,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +377,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -399,6 +404,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -480,6 +486,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -496,12 +503,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -98864,7 +112060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +590,9 @@
+@@ -582,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98878,22 +112074,15 @@
mostlyclean-libtool:
--- lib/store/Makefile.in
+++ lib/store/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkstore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -295,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98903,24 +112092,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,6 +509,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -556,6 +559,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -595,7 +599,7 @@
+@@ -353,18 +357,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,8 +421,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -443,6 +448,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -524,6 +530,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -540,12 +547,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98929,7 +112164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +637,9 @@
+@@ -629,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -98943,22 +112178,15 @@
@$(NORMAL_INSTALL)
--- lib/store/tests/Makefile.in
+++ lib/store/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
- ####### General stuff
--SOURCES = $(storage_test_SOURCES) $(storedroptest_SOURCES) $(xmlwritertest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -277,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -98968,24 +112196,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,6 +491,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -538,6 +541,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -574,7 +578,7 @@
+@@ -335,18 +339,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +403,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -425,6 +430,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -506,6 +512,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -522,12 +529,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -570,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -98994,7 +112268,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +616,9 @@
+@@ -608,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99008,13 +112282,15 @@
clean-checkPROGRAMS:
--- Makefile.in
+++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -267,6 +267,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -267,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99024,24 +112300,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,6 +481,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -526,6 +531,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -566,7 +572,7 @@
+@@ -325,18 +329,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,8 +393,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -415,6 +420,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -496,6 +502,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -512,12 +519,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -99050,7 +112372,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,12 +614,12 @@
+@@ -606,12 +615,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -99065,7 +112387,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -625,7 +631,7 @@
+@@ -623,7 +632,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -99074,24 +112396,26 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1135,7 +1141,7 @@
+@@ -1133,7 +1142,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
-+KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in acinclude.m4 configure Makefile.am changes-1.5 Makefile.am.in
++KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in configure Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
#>+ 2
docs-am:
--- mimetypes/kde33/Makefile.in
+++ mimetypes/kde33/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99101,24 +112425,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -543,7 +549,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -99127,7 +112497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99141,13 +112511,15 @@
mostlyclean-libtool:
--- mimetypes/kde351/Makefile.in
+++ mimetypes/kde351/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99157,24 +112529,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -531,7 +537,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -529,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -99183,7 +112601,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +575,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99197,13 +112615,15 @@
mostlyclean-libtool:
--- mimetypes/Makefile.in
+++ mimetypes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99213,24 +112633,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -537,7 +543,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -535,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -99239,7 +112705,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +581,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99253,13 +112719,15 @@
mostlyclean-libtool:
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,9 @@
+@@ -96,6 +96,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -233,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99269,24 +112737,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +447,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -492,6 +497,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -520,7 +526,7 @@
+@@ -291,18 +295,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +359,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -381,6 +386,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -462,6 +468,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -478,12 +485,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -99295,7 +112809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +564,9 @@
+@@ -556,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99307,37 +112821,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -829,9 +835,9 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-newslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-tab_first.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-fontsizedown.png $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-view_remove.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-aotop.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-kdb_table.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
-@@ -967,9 +973,9 @@
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
-+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
-- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
--- pics/Makefile.in
+++ pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99347,24 +112841,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -99373,7 +112913,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99387,13 +112927,15 @@
mostlyclean-libtool:
--- plugins/Makefile.in
+++ plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99403,24 +112945,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -99429,7 +113017,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99443,22 +113031,15 @@
mostlyclean-libtool:
--- plugins/scan/Makefile.in
+++ plugins/scan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kofficescan_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99468,24 +113049,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -585,7 +589,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99494,7 +113121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +627,9 @@
+@@ -619,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99508,13 +113135,15 @@
@$(NORMAL_INSTALL)
--- servicetypes/Makefile.in
+++ servicetypes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99524,24 +113153,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -532,7 +538,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -530,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -99550,7 +113225,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +576,9 @@
+@@ -568,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99562,25 +113237,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- subdirs
-+++ subdirs
-@@ -8,6 +8,7 @@
- kdgantt
- kformula
- kivio
-+koffice-1.5.1
- koshell
- kounavail
- kpresenter
--- templates/Makefile.in
+++ templates/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -244,6 +244,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -244,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99590,24 +113257,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,6 +458,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -503,6 +508,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -533,7 +539,7 @@
+@@ -302,18 +306,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,8 +370,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -392,6 +397,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -473,6 +479,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -489,12 +496,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -531,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -99616,7 +113329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +577,9 @@
+@@ -569,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99630,22 +113343,15 @@
mostlyclean-libtool:
--- tools/converter/Makefile.in
+++ tools/converter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(koconverter_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -269,6 +267,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -267,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99655,24 +113361,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,6 +481,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -528,6 +531,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -560,7 +564,7 @@
+@@ -325,18 +329,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,8 +393,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -415,6 +420,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -496,6 +502,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -512,12 +519,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -556,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99681,7 +113433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +602,9 @@
+@@ -594,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99695,22 +113447,15 @@
@$(NORMAL_INSTALL)
--- tools/kfile-plugins/abiword/Makefile.in
+++ tools/kfile-plugins/abiword/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_abiword_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99720,24 +113465,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99746,7 +113537,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99760,22 +113551,15 @@
@$(NORMAL_INSTALL)
--- tools/kfile-plugins/gnumeric/Makefile.in
+++ tools/kfile-plugins/gnumeric/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_gnumeric_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99785,24 +113569,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99811,7 +113641,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99825,22 +113655,15 @@
@$(NORMAL_INSTALL)
--- tools/kfile-plugins/koffice/Makefile.in
+++ tools/kfile-plugins/koffice/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_koffice_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99850,24 +113673,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99876,7 +113745,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99890,13 +113759,15 @@
@$(NORMAL_INSTALL)
--- tools/kfile-plugins/Makefile.in
+++ tools/kfile-plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99906,24 +113777,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -99932,7 +113849,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -99946,22 +113863,15 @@
mostlyclean-libtool:
--- tools/kfile-plugins/ooo/Makefile.in
+++ tools/kfile-plugins/ooo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_ooo_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -279,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -99971,24 +113881,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,6 +493,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -540,6 +543,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -582,7 +586,7 @@
+@@ -337,18 +341,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +405,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -427,6 +432,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -508,6 +514,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -524,12 +531,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -99997,7 +113953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +624,9 @@
+@@ -616,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100011,35 +113967,15 @@
@$(NORMAL_INSTALL)
--- tools/kthesaurus/Makefile.in
+++ tools/kthesaurus/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(kthesaurus_la_SOURCES)
--#>+ 1
--SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -102,7 +98,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kthesaurus_la_SOURCES)
-+#>- SOURCES = $(kthesaurus_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
- #>- DIST_SOURCES = $(kthesaurus_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
-@@ -294,6 +292,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -292,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100049,24 +113985,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,6 +506,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -553,6 +556,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -592,7 +596,7 @@
+@@ -350,18 +354,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +418,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -440,6 +445,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -521,6 +527,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -537,12 +544,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -100075,7 +114057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +634,9 @@
+@@ -626,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100089,13 +114071,15 @@
@$(NORMAL_INSTALL)
--- tools/Makefile.in
+++ tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+@@ -112,6 +112,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -249,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100105,24 +114089,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,6 +463,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -508,6 +513,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -535,7 +541,7 @@
+@@ -307,18 +311,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +375,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -397,6 +402,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -478,6 +484,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -494,12 +501,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -100131,7 +114161,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +579,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100145,13 +114175,15 @@
mostlyclean-libtool:
--- tools/quickprint/Makefile.in
+++ tools/quickprint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -243,6 +243,9 @@
+@@ -106,6 +106,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -243,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100161,24 +114193,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,6 +457,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -502,6 +507,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -530,7 +536,7 @@
+@@ -301,18 +305,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +369,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -391,6 +396,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -472,6 +478,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -488,12 +495,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -528,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -100187,7 +114265,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +574,9 @@
+@@ -566,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100201,13 +114279,15 @@
mostlyclean-libtool:
--- tools/spell/Makefile.in
+++ tools/spell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -253,6 +253,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -253,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100217,24 +114297,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,6 +467,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -512,6 +517,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -538,7 +544,7 @@
+@@ -311,18 +315,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,8 +379,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -401,6 +406,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -482,6 +488,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -498,12 +505,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -536,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -100243,7 +114369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +582,9 @@
+@@ -574,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100257,22 +114383,15 @@
mostlyclean-libtool:
--- tools/thesaurus/Makefile.in
+++ tools/thesaurus/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libthesaurustool_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -280,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100282,24 +114401,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,6 +494,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -541,6 +544,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -338,18 +342,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,8 +406,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -428,6 +433,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -509,6 +515,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -525,12 +532,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -100308,7 +114473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -100322,22 +114487,15 @@
@$(NORMAL_INSTALL)
--- tools/thumbnail/Makefile.in
+++ tools/thumbnail/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(clipartthumbnail_la_SOURCES) $(kofficethumbnail_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INC_KFEEDBACK = @INC_KFEEDBACK@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -283,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -100347,24 +114505,70 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,6 +497,8 @@
- kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
- kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
- kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
-+koffice_1_5_1_SUBDIR_included_FALSE = @koffice_1_5_1_SUBDIR_included_FALSE@
-+koffice_1_5_1_SUBDIR_included_TRUE = @koffice_1_5_1_SUBDIR_included_TRUE@
- koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
- koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
- kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -544,6 +547,7 @@
- servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
- servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
- sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
-@@ -583,7 +587,7 @@
+@@ -341,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +409,11 @@
+ compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
+ compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
+ example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
+@@ -431,6 +436,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
+@@ -512,6 +518,7 @@
+ lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -528,12 +535,14 @@
+ need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
+ need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
+ plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -100373,7 +114577,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +625,9 @@
+@@ -617,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list