rev 4419 - trunk/packages/kdesdk/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Aug 26 21:20:53 UTC 2006
Author: chrsmrtn
Date: 2006-08-26 21:20:32 +0000 (Sat, 26 Aug 2006)
New Revision: 4419
Modified:
trunk/packages/kdesdk/debian/patches/98_buildprep.diff
Log:
buildprep update for kdesdk.
Modified: trunk/packages/kdesdk/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/98_buildprep.diff 2006-08-26 21:19:42 UTC (rev 4418)
+++ trunk/packages/kdesdk/debian/patches/98_buildprep.diff 2006-08-26 21:20:32 UTC (rev 4419)
@@ -3883,7 +3883,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -266,6 +267,9 @@
+@@ -235,6 +236,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -266,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3893,7 +3906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -306,18 +310,16 @@
+@@ -306,18 +316,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -3913,7 +3926,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,14 +340,18 @@
+@@ -338,14 +346,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -3932,7 +3945,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -412,14 +418,17 @@
+@@ -412,14 +424,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -3950,7 +3963,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -494,7 +503,7 @@
+@@ -494,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3959,7 +3972,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +541,9 @@
+@@ -532,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3981,7 +3994,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -311,6 +312,9 @@
+@@ -280,6 +281,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -311,6 +318,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3991,7 +4017,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,18 +355,16 @@
+@@ -351,18 +361,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -4011,7 +4037,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,14 +385,18 @@
+@@ -383,14 +391,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -4030,7 +4056,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -457,14 +463,17 @@
+@@ -457,14 +469,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -4048,7 +4074,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -4057,7 +4083,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4069,7 +4095,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1334,18 +1343,18 @@
+@@ -1334,18 +1349,18 @@
cervisia_DEPENDENCIES = libkdeinit_cervisia.la
#>+ 3
@@ -4094,7 +4120,7 @@
#>+ 3
tagdlg.moc: $(srcdir)/tagdlg.h
-@@ -1390,18 +1399,18 @@
+@@ -1390,18 +1405,18 @@
mocs: diffdlg.moc
#>+ 3
@@ -4119,7 +4145,7 @@
#>+ 3
mergedlg.moc: $(srcdir)/mergedlg.h
-@@ -1565,10 +1574,10 @@
+@@ -1565,10 +1580,10 @@
#>+ 3
clean-metasources:
@@ -4132,7 +4158,7 @@
#>+ 5
clean-idl:
-@@ -1597,18 +1606,18 @@
+@@ -1597,18 +1612,18 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/cervisia.png
@@ -4154,7 +4180,7 @@
#>+ 15
force-reedit:
-@@ -1673,7 +1682,7 @@
+@@ -1673,7 +1688,7 @@
rm -f cervisia_la.all_cpp.final cervisia_la.all_cpp.files
#>+ 11
@@ -4173,7 +4199,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4183,7 +4222,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -4203,7 +4242,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -4222,7 +4261,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -4240,7 +4279,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -356,7 +365,7 @@
+@@ -356,7 +371,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -4249,7 +4288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +403,9 @@
+@@ -394,9 +409,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4261,7 +4300,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -539,80 +548,80 @@
+@@ -539,80 +554,80 @@
.NOEXPORT:
#>+ 2
@@ -4420,13 +4459,23 @@
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
+@@ -153,6 +153,9 @@
+ /* Defined if compiling without arts */
+ #undef WITHOUT_ARTS
+
++/* Defines the executable of xmllint */
++#undef XMLLINT
++
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+ #undef YYTEXT_POINTER
--- configure
+++ configure
@@ -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.59d.
++# Generated by GNU Autoconf 2.60.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4708,8 +4757,8 @@
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells which exist, to save several forks.
-+ if test -f "$as_shell" &&
++ # Try only shells that exist, to save several forks.
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -5116,7 +5165,7 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,339 @@
+@@ -455,17 +745,345 @@
#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
@@ -5398,6 +5447,12 @@
+include_kioslave_svn_TRUE
+include_kioslave_svn_FALSE
+KMTRACE_LIBS
++LIBXSLT_LIBS
++LIBXSLT_CFLAGS
++LIBXSLT_RPATH
++LIBXML_LIBS
++LIBXML_CFLAGS
++LIBXML_RPATH
+TOPSUBDIRS
+cervisia_SUBDIR_included_TRUE
+cervisia_SUBDIR_included_FALSE
@@ -5461,7 +5516,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -492,34 +1104,48 @@
+@@ -492,34 +1110,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.
@@ -5517,7 +5572,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -541,12 +1167,18 @@
+@@ -541,12 +1173,18 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -5539,7 +5594,7 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
-@@ -554,7 +1186,17 @@
+@@ -554,7 +1192,17 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5558,7 +5613,7 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1205,7 @@
+@@ -563,11 +1211,7 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5571,7 +5626,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1232,12 @@
+@@ -594,6 +1238,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -5584,7 +5639,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -618,13 +1262,16 @@
+@@ -618,13 +1268,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -5605,7 +5660,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1336,16 @@
+@@ -689,6 +1342,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -5622,7 +5677,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -745,11 +1402,7 @@
+@@ -745,11 +1408,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -5635,7 +5690,7 @@
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1411,7 @@
+@@ -758,7 +1417,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -5644,7 +5699,7 @@
--x)
# Obsolete; use --with-x.
-@@ -789,8 +1442,7 @@
+@@ -789,8 +1448,7 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -5654,7 +5709,7 @@
export $ac_envvar ;;
*)
-@@ -810,27 +1462,19 @@
+@@ -810,27 +1468,19 @@
{ (exit 1); exit 1; }; }
fi
@@ -5692,7 +5747,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1501,76 @@
+@@ -857,94 +1507,76 @@
test "$silent" = yes && exec 6>/dev/null
@@ -5844,7 +5899,7 @@
#
# Report the --help message.
-@@ -973,9 +1599,6 @@
+@@ -973,9 +1605,6 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -5854,7 +5909,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -993,15 +1616,22 @@
+@@ -993,15 +1622,22 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -5880,7 +5935,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1025,6 +1655,8 @@
+@@ -1025,6 +1661,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -5889,7 +5944,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1042,10 +1674,8 @@
+@@ -1042,10 +1680,8 @@
of memory)
--enable-closure delay template instantiation
--enable-nmcheck enable automatic namespace cleanness check
@@ -5902,7 +5957,7 @@
--enable-libsuffix /lib directory suffix (64,32,none,auto=default)
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
-@@ -1067,8 +1697,7 @@
+@@ -1067,8 +1703,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]
@@ -5912,7 +5967,7 @@
--with-extra-includes=DIR
adds non standard include paths
--with-extra-libs=DIR adds non standard library paths
-@@ -1098,131 +1727,100 @@
+@@ -1098,131 +1733,100 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -6065,7 +6120,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6084,7 +6139,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -6093,7 +6148,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1241,7 +1839,7 @@
+@@ -1241,7 +1845,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`
@@ -6102,7 +6157,7 @@
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1255,6 +1853,7 @@
+@@ -1255,6 +1859,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -6110,7 +6165,7 @@
} >&5
-@@ -1276,7 +1875,6 @@
+@@ -1276,7 +1881,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -6118,7 +6173,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1287,7 +1885,7 @@
+@@ -1287,7 +1891,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -6127,7 +6182,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1309,9 +1907,7 @@
+@@ -1309,9 +1913,7 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -6138,7 +6193,7 @@
;;
esac
done
-@@ -1322,8 +1918,8 @@
+@@ -1322,8 +1924,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.
@@ -6149,7 +6204,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1336,20 +1932,34 @@
+@@ -1336,20 +1938,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -6194,7 +6249,7 @@
echo
cat <<\_ASBOX
-@@ -1360,22 +1970,28 @@
+@@ -1360,22 +1976,28 @@
echo
for ac_var in $ac_subst_vars
do
@@ -6230,7 +6285,7 @@
done | sort
echo
fi
-@@ -1387,26 +2003,24 @@
+@@ -1387,26 +2009,24 @@
## ----------- ##
_ASBOX
echo
@@ -6262,7 +6317,7 @@
# Predefined preprocessor variables.
-@@ -1437,14 +2051,17 @@
+@@ -1437,14 +2057,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -6287,7 +6342,7 @@
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1460,8 +2077,8 @@
+@@ -1460,8 +2083,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -6298,7 +6353,7 @@
esac
fi
else
-@@ -1473,12 +2090,11 @@
+@@ -1473,12 +2096,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -6314,7 +6369,7 @@
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1503,8 +2119,7 @@
+@@ -1503,8 +2125,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -6324,7 +6379,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1521,12 +2136,6 @@
+@@ -1521,12 +2142,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -6337,7 +6392,7 @@
-@@ -1543,110 +2152,165 @@
+@@ -1543,110 +2158,165 @@
@@ -6555,7 +6610,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1656,17 +2320,17 @@
+@@ -1656,17 +2326,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6576,7 +6631,7 @@
am__api_version="1.9"
-@@ -1688,8 +2352,8 @@
+@@ -1688,8 +2358,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.
@@ -6587,7 +6642,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1711,7 +2375,7 @@
+@@ -1711,7 +2381,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6596,7 +6651,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -1730,21 +2394,22 @@
+@@ -1730,21 +2400,22 @@
;;
esac
done
@@ -6624,7 +6679,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1758,8 +2423,8 @@
+@@ -1758,8 +2429,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
@@ -6635,7 +6690,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1771,8 +2436,8 @@
+@@ -1771,8 +2442,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6646,7 +6701,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1782,8 +2447,8 @@
+@@ -1782,8 +2453,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6657,7 +6712,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1825,8 +2490,8 @@
+@@ -1825,8 +2496,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6668,7 +6723,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1877,8 +2542,8 @@
+@@ -1877,8 +2548,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
@@ -6679,7 +6734,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1891,54 +2556,57 @@
+@@ -1891,54 +2562,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6718,7 +6773,7 @@
-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'`
++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
@@ -6758,7 +6813,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2009,8 +2677,8 @@
+@@ -2009,8 +2683,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
@@ -6769,7 +6824,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2023,32 +2691,34 @@
+@@ -2023,32 +2697,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6811,7 +6866,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2061,27 +2731,41 @@
+@@ -2061,27 +2737,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6860,7 +6915,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2101,6 +2785,31 @@
+@@ -2101,6 +2791,31 @@
@@ -6892,7 +6947,7 @@
unset CDPATH
-@@ -2119,14 +2828,14 @@
+@@ -2119,14 +2834,14 @@
if test "x$prefix" = "xNONE"; then
@@ -6910,7 +6965,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2169,8 +2878,8 @@
+@@ -2169,8 +2884,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6921,7 +6976,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2181,8 +2890,8 @@
+@@ -2181,8 +2896,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6932,7 +6987,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2191,14 +2900,14 @@
+@@ -2191,14 +2906,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -6950,7 +7005,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2241,8 +2950,8 @@
+@@ -2241,8 +2956,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6961,7 +7016,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2253,8 +2962,8 @@
+@@ -2253,8 +2968,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6972,7 +7027,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2277,16 +2986,16 @@
+@@ -2277,16 +2992,16 @@
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
@@ -6995,7 +7050,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2299,13 +3008,13 @@
+@@ -2299,13 +3014,13 @@
@@ -7013,7 +7068,7 @@
val=
-@@ -2322,11 +3031,11 @@
+@@ -2322,11 +3037,11 @@
@@ -7027,7 +7082,7 @@
am_make=${MAKE-make}
-@@ -2336,8 +3045,8 @@
+@@ -2336,8 +3051,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7038,7 +7093,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2364,15 +3073,15 @@
+@@ -2364,15 +3079,15 @@
fi
@@ -7059,7 +7114,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2392,10 +3101,9 @@
+@@ -2392,10 +3107,9 @@
@@ -7072,7 +7127,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2415,18 +3123,18 @@
+@@ -2415,18 +3129,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -7098,7 +7153,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2435,12 +3143,12 @@
+@@ -2435,12 +3149,12 @@
else
kde_use_strict_options="no"
@@ -7115,7 +7170,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2449,20 +3157,21 @@
+@@ -2449,20 +3163,21 @@
else
kde_use_warnings="yes"
@@ -7142,7 +7197,7 @@
CFLAGS=" $CFLAGS"
-@@ -2474,8 +3183,8 @@
+@@ -2474,8 +3189,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
@@ -7153,7 +7208,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2488,32 +3197,34 @@
+@@ -2488,32 +3203,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7195,7 +7250,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2526,36 +3237,51 @@
+@@ -2526,36 +3243,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7257,7 +7312,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2568,74 +3294,34 @@
+@@ -2568,74 +3300,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7341,7 +7396,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2649,7 +3335,7 @@
+@@ -2649,7 +3341,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7350,7 +7405,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2660,6 +3346,7 @@
+@@ -2660,6 +3352,7 @@
fi
done
done
@@ -7358,7 +7413,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2677,22 +3364,23 @@
+@@ -2677,22 +3370,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7389,7 +7444,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2705,36 +3393,38 @@
+@@ -2705,36 +3399,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7436,7 +7491,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2747,29 +3437,45 @@
+@@ -2747,29 +3443,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7488,7 +7543,7 @@
fi
fi
-@@ -2782,21 +3488,35 @@
+@@ -2782,21 +3494,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7532,7 +7587,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2821,46 +3541,70 @@
+@@ -2821,46 +3547,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.
@@ -7625,7 +7680,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2873,19 +3617,23 @@
+@@ -2873,19 +3623,23 @@
fi
ac_exeext=$ac_cv_exeext
@@ -7656,7 +7711,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2904,22 +3652,27 @@
+@@ -2904,22 +3658,27 @@
fi
fi
fi
@@ -7696,7 +7751,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2930,9 +3683,8 @@
+@@ -2930,9 +3689,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7707,7 +7762,7 @@
break;;
* ) break;;
esac
-@@ -2946,14 +3698,14 @@
+@@ -2946,14 +3704,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7726,7 +7781,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2973,14 +3725,20 @@
+@@ -2973,14 +3731,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7751,7 +7806,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2998,12 +3756,12 @@
+@@ -2998,12 +3762,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7768,7 +7823,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3026,24 +3784,36 @@
+@@ -3026,24 +3790,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7813,15 +7868,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3052,24 +3822,28 @@
+@@ -3052,24 +3828,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -7849,7 +7905,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3085,24 +3859,147 @@
+@@ -3085,24 +3865,147 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8005,31 +8061,32 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3111,12 +4008,20 @@
+@@ -3111,12 +4014,20 @@
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
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+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
-@@ -3132,12 +4037,12 @@
+@@ -3132,12 +4043,12 @@
CFLAGS=
fi
fi
@@ -8046,7 +8103,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3171,10 +4076,10 @@
+@@ -3171,12 +4082,17 @@
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -8058,8 +8115,15 @@
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
int test (int i, double x);
-@@ -3191,205 +4096,74 @@
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3191,205 +4107,74 @@
return 0;
}
_ACEOF
@@ -8126,8 +8190,9 @@
+
fi
+-rm -f conftest.err conftest.$ac_objext
+
- rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
@@ -8303,7 +8368,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3398,8 +4172,8 @@
+@@ -3398,8 +4183,8 @@
depcc="$CC" am_compiler_list=
@@ -8314,7 +8379,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3488,8 +4262,8 @@
+@@ -3488,8 +4273,8 @@
fi
fi
@@ -8325,7 +8390,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3511,8 +4285,8 @@
+@@ -3511,8 +4296,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
@@ -8336,7 +8401,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3546,8 +4320,13 @@
+@@ -3546,8 +4331,13 @@
#endif
Syntax error
_ACEOF
@@ -8352,7 +8417,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3572,9 +4351,10 @@
+@@ -3572,9 +4362,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8364,7 +8429,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3584,8 +4364,13 @@
+@@ -3584,8 +4375,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8380,7 +8445,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3612,6 +4397,7 @@
+@@ -3612,6 +4408,7 @@
ac_preproc_ok=:
break
fi
@@ -8388,7 +8453,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3629,8 +4415,8 @@
+@@ -3629,8 +4426,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8399,7 +8464,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3653,8 +4439,13 @@
+@@ -3653,8 +4450,13 @@
#endif
Syntax error
_ACEOF
@@ -8415,7 +8480,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3679,9 +4470,10 @@
+@@ -3679,9 +4481,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8427,7 +8492,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3691,8 +4483,13 @@
+@@ -3691,8 +4494,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8443,7 +8508,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3719,6 +4516,7 @@
+@@ -3719,6 +4527,7 @@
ac_preproc_ok=:
break
fi
@@ -8451,7 +8516,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3769,18 +4567,22 @@
+@@ -3769,18 +4578,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8479,7 +8544,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3793,36 +4595,38 @@
+@@ -3793,36 +4606,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8526,7 +8591,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3835,55 +4639,85 @@
+@@ -3835,55 +4650,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8630,7 +8695,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3906,24 +4740,36 @@
+@@ -3906,24 +4751,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8675,15 +8740,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3932,24 +4778,28 @@
+@@ -3932,24 +4789,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -8711,7 +8777,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3965,24 +4815,36 @@
+@@ -3965,24 +4826,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8756,7 +8822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3991,70 +4853,53 @@
+@@ -3991,70 +4864,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8851,7 +8917,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4063,61 +4908,91 @@
+@@ -4063,61 +4919,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8928,20 +8994,21 @@
+
fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8964,7 +9031,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4126,8 +5001,8 @@
+@@ -4126,8 +5012,8 @@
depcc="$CXX" am_compiler_list=
@@ -8975,7 +9042,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4216,8 +5091,8 @@
+@@ -4216,8 +5102,8 @@
fi
fi
@@ -8986,7 +9053,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4235,8 +5110,8 @@
+@@ -4235,8 +5121,8 @@
@@ -8997,7 +9064,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4261,24 +5136,36 @@
+@@ -4261,24 +5147,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9042,7 +9109,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4287,13 +5174,14 @@
+@@ -4287,13 +5185,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9050,17 +9117,18 @@
+ kde_bad_compiler=yes
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+echo "${ECHO_T}$kde_bad_compiler" >&6; }
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4335,17 +5223,16 @@
+@@ -4335,17 +5234,16 @@
fi
fi
@@ -9082,7 +9150,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4373,24 +5260,36 @@
+@@ -4373,24 +5271,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9127,17 +9195,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4399,7 +5298,9 @@
+@@ -4399,8 +5309,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4413,29 +5314,28 @@
+ ac_ext=c
+@@ -4413,29 +5325,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9175,7 +9245,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4462,24 +5362,36 @@
+@@ -4462,24 +5373,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9220,17 +9290,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4488,7 +5400,9 @@
+@@ -4488,8 +5411,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4502,13 +5416,13 @@
+ ac_ext=c
+@@ -4502,13 +5427,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9248,7 +9320,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4529,16 +5443,15 @@
+@@ -4529,16 +5454,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9269,7 +9341,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4565,24 +5478,36 @@
+@@ -4565,24 +5489,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9314,17 +9386,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4591,7 +5516,9 @@
+@@ -4591,8 +5527,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4605,16 +5532,16 @@
+ ac_ext=c
+@@ -4605,16 +5543,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9345,7 +9419,7 @@
:
fi
-@@ -4629,16 +5556,15 @@
+@@ -4629,16 +5567,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"
@@ -9366,7 +9440,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4665,24 +5591,36 @@
+@@ -4665,24 +5602,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9411,17 +9485,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4691,7 +5629,9 @@
+@@ -4691,8 +5640,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4705,27 +5645,26 @@
+ ac_ext=c
+@@ -4705,27 +5656,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9456,7 +9532,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4750,24 +5689,36 @@
+@@ -4750,24 +5700,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9501,17 +9577,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4776,7 +5727,9 @@
+@@ -4776,8 +5738,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4790,13 +5743,13 @@
+ ac_ext=c
+@@ -4790,13 +5754,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9529,7 +9607,7 @@
:
fi
-@@ -4804,16 +5757,15 @@
+@@ -4804,16 +5768,15 @@
;;
esac
@@ -9550,7 +9628,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4840,24 +5792,36 @@
+@@ -4840,24 +5803,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9595,17 +9673,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4866,7 +5830,9 @@
+@@ -4866,8 +5841,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4880,28 +5846,27 @@
+ ac_ext=c
+@@ -4880,28 +5857,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9642,7 +9722,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4928,24 +5893,36 @@
+@@ -4928,24 +5904,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9687,17 +9767,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4954,7 +5931,9 @@
+@@ -4954,8 +5942,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4968,28 +5947,27 @@
+ ac_ext=c
+@@ -4968,28 +5958,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9734,7 +9816,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5016,24 +5994,36 @@
+@@ -5016,24 +6005,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9779,17 +9861,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5042,7 +6032,9 @@
+@@ -5042,8 +6043,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5056,13 +6048,13 @@
+ ac_ext=c
+@@ -5056,13 +6059,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9807,7 +9891,7 @@
:
fi
-@@ -5074,13 +6066,13 @@
+@@ -5074,13 +6077,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9825,7 +9909,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5088,16 +6080,15 @@
+@@ -5088,16 +6091,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9846,7 +9930,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5124,24 +6115,36 @@
+@@ -5124,24 +6126,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9891,17 +9975,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5150,7 +6153,9 @@
+@@ -5150,8 +6164,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5164,13 +6169,13 @@
+ ac_ext=c
+@@ -5164,13 +6180,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9919,7 +10005,7 @@
:
fi
-@@ -5182,16 +6187,15 @@
+@@ -5182,16 +6198,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9940,7 +10026,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5218,24 +6222,36 @@
+@@ -5218,24 +6233,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9985,17 +10071,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5244,7 +6260,9 @@
+@@ -5244,8 +6271,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5258,28 +6276,27 @@
+ ac_ext=c
+@@ -5258,28 +6287,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10032,7 +10120,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5306,24 +6323,36 @@
+@@ -5306,24 +6334,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10077,17 +10165,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5332,7 +6361,9 @@
+@@ -5332,8 +6372,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5346,28 +6377,27 @@
+ ac_ext=c
+@@ -5346,28 +6388,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10124,7 +10214,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5394,24 +6424,36 @@
+@@ -5394,24 +6435,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10169,17 +10259,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5420,7 +6462,9 @@
+@@ -5420,8 +6473,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5434,28 +6478,27 @@
+ ac_ext=c
+@@ -5434,28 +6489,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10216,7 +10308,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5482,24 +6525,36 @@
+@@ -5482,24 +6536,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10261,17 +10353,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5508,7 +6563,9 @@
+@@ -5508,8 +6574,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5522,13 +6579,13 @@
+ ac_ext=c
+@@ -5522,13 +6590,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10289,7 +10383,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5536,37 +6593,37 @@
+@@ -5536,37 +6604,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10341,7 +10435,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5598,24 +6655,36 @@
+@@ -5598,24 +6666,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10386,7 +10480,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5624,9 +6693,10 @@
+@@ -5624,18 +6704,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10394,11 +10488,12 @@
+ kde_cv_opt_noinline_match=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5634,8 +6704,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -10409,7 +10504,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5655,16 +6725,15 @@
+@@ -5655,16 +6736,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10430,7 +10525,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5691,24 +6760,36 @@
+@@ -5691,24 +6771,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10475,17 +10570,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5717,7 +6798,9 @@
+@@ -5717,8 +6809,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5731,29 +6814,28 @@
+ ac_ext=c
+@@ -5731,29 +6825,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10523,7 +10620,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5780,24 +6862,36 @@
+@@ -5780,24 +6873,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10568,17 +10665,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5806,7 +6900,9 @@
+@@ -5806,8 +6911,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5820,28 +6916,27 @@
+ ac_ext=c
+@@ -5820,28 +6927,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10615,7 +10714,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5868,24 +6963,36 @@
+@@ -5868,24 +6974,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10660,17 +10759,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5894,7 +7001,9 @@
+@@ -5894,8 +7012,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5908,28 +7017,27 @@
+ ac_ext=c
+@@ -5908,28 +7028,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10707,7 +10808,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5956,24 +7064,36 @@
+@@ -5956,24 +7075,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10752,17 +10853,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5982,7 +7102,9 @@
+@@ -5982,8 +7113,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5996,28 +7118,27 @@
+ ac_ext=c
+@@ -5996,28 +7129,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10799,7 +10902,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6044,24 +7165,36 @@
+@@ -6044,24 +7176,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10844,17 +10947,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6070,7 +7203,9 @@
+@@ -6070,8 +7214,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6084,28 +7219,27 @@
+ ac_ext=c
+@@ -6084,28 +7230,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10891,7 +10996,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6132,24 +7266,36 @@
+@@ -6132,24 +7277,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10936,17 +11041,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6158,7 +7304,9 @@
+@@ -6158,8 +7315,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6172,13 +7320,13 @@
+ ac_ext=c
+@@ -6172,13 +7331,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10964,7 +11071,7 @@
:
fi
-@@ -6285,13 +7433,13 @@
+@@ -6285,13 +7444,13 @@
fi
@@ -10981,7 +11088,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6321,8 +7469,13 @@
+@@ -6321,8 +7480,13 @@
#endif
Syntax error
_ACEOF
@@ -10997,7 +11104,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6347,9 +7500,10 @@
+@@ -6347,9 +7511,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11009,7 +11116,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6359,8 +7513,13 @@
+@@ -6359,8 +7524,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11025,7 +11132,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6387,6 +7546,7 @@
+@@ -6387,6 +7557,7 @@
ac_preproc_ok=:
break
fi
@@ -11033,7 +11140,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6404,8 +7564,8 @@
+@@ -6404,8 +7575,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11044,7 +11151,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6428,8 +7588,13 @@
+@@ -6428,8 +7599,13 @@
#endif
Syntax error
_ACEOF
@@ -11060,7 +11167,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6454,9 +7619,10 @@
+@@ -6454,9 +7630,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11072,7 +11179,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6466,8 +7632,13 @@
+@@ -6466,8 +7643,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11088,7 +11195,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6494,6 +7665,7 @@
+@@ -6494,6 +7676,7 @@
ac_preproc_ok=:
break
fi
@@ -11096,7 +11203,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6520,16 +7692,15 @@
+@@ -6520,16 +7703,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11117,7 +11224,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6556,24 +7727,36 @@
+@@ -6556,24 +7738,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11162,17 +11269,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6582,7 +7765,9 @@
+@@ -6582,8 +7776,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6596,22 +7781,21 @@
+ ac_ext=c
+@@ -6596,22 +7792,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11201,7 +11310,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6627,36 +7811,36 @@
+@@ -6627,36 +7822,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11248,7 +11357,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6683,24 +7867,36 @@
+@@ -6683,24 +7878,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11293,17 +11402,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6709,7 +7905,9 @@
+@@ -6709,8 +7916,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6723,29 +7921,28 @@
+ ac_ext=c
+@@ -6723,29 +7932,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11341,7 +11452,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6772,24 +7969,36 @@
+@@ -6772,24 +7980,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11386,17 +11497,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6798,7 +8007,9 @@
+@@ -6798,8 +8018,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6812,13 +8023,13 @@
+ ac_ext=c
+@@ -6812,13 +8034,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11414,7 +11527,7 @@
:
fi
-@@ -6828,13 +8039,13 @@
+@@ -6828,13 +8050,13 @@
@@ -11432,7 +11545,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6847,13 +8058,13 @@
+@@ -6847,13 +8069,13 @@
@@ -11450,7 +11563,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6864,272 +8075,93 @@
+@@ -6864,278 +8086,99 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11480,15 +11593,6 @@
+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
- save_CXXFLAGS="$CXXFLAGS"
@@ -11499,6 +11603,14 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
++
-int
-main ()
@@ -11546,6 +11658,7 @@
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
@@ -11629,7 +11742,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -11786,10 +11899,21 @@
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
-fi;
-
- if test "$kdelibsuff" = "auto"; then
-
-@@ -7150,8 +8182,8 @@
+-
+- if test "$kdelibsuff" = "auto"; then
+-
+-cat > conftest.c << EOF
+-#include <stdio.h>
+-int main() {
++ if test "$kdelibsuff" = "auto"; then
++
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
+ return 0;
+ }
+ EOF
+@@ -7150,8 +8193,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11800,7 +11924,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7167,14 +8199,13 @@
+@@ -7167,14 +8210,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11819,7 +11943,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7193,10 +8224,11 @@
+@@ -7193,10 +8235,11 @@
esac
else
enable_fast_install=yes
@@ -11834,7 +11958,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7220,7 +8252,7 @@
+@@ -7220,7 +8263,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
@@ -11843,7 +11967,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7249,37 +8281,184 @@
+@@ -7249,37 +8292,184 @@
fi
SED=$lt_cv_path_SED
@@ -12045,7 +12169,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7308,11 +8487,11 @@
+@@ -7308,11 +8498,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12061,7 +12185,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7325,7 +8504,7 @@
+@@ -7325,7 +8515,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,
@@ -12070,7 +12194,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7345,21 +8524,21 @@
+@@ -7345,21 +8535,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12099,7 +12223,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7369,29 +8548,38 @@
+@@ -7369,29 +8559,38 @@
;;
esac
fi
@@ -12146,7 +12270,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7399,56 +8587,63 @@
+@@ -7399,56 +8598,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12244,7 +12368,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7475,44 +8670,36 @@
+@@ -7475,44 +8681,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12299,7 +12423,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7528,7 +8715,7 @@
+@@ -7528,7 +8726,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12308,7 +12432,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
-@@ -7544,43 +8731,27 @@
+@@ -7544,43 +8742,27 @@
esac
;;
@@ -12365,7 +12489,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
-@@ -7599,32 +8770,22 @@
+@@ -7599,32 +8781,22 @@
;;
openbsd*)
@@ -12401,7 +12525,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]'
-@@ -7645,17 +8806,20 @@
+@@ -7645,17 +8817,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12425,7 +12549,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7664,14 +8828,17 @@
+@@ -7664,14 +8839,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12446,16 +12570,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7698,7 +8865,7 @@
+@@ -7698,7 +8876,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7701 "configure"' > conftest.$ac_ext
-+ echo '#line 8868 "configure"' > conftest.$ac_ext
++ echo '#line 8879 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7741,14 +8908,13 @@
+@@ -7741,14 +8919,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12472,7 +12596,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7760,7 +8926,6 @@
+@@ -7760,7 +8937,6 @@
esac
;;
*64-bit*)
@@ -12480,7 +12604,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7785,8 +8950,8 @@
+@@ -7785,8 +8961,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12491,7 +12615,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7812,24 +8977,36 @@
+@@ -7812,24 +8988,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12536,18 +12660,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7838,8 +9015,9 @@
+@@ -7838,9 +9026,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7849,22 +9027,42 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7849,22 +9038,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12597,7 +12723,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7888,24 +9086,36 @@
+@@ -7888,24 +9097,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12642,18 +12768,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7914,8 +9124,9 @@
+@@ -7914,9 +9135,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7972,6 +9183,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7972,6 +9194,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12661,7 +12789,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7991,18 +9203,27 @@
+@@ -7991,18 +9214,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12695,7 +12823,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8015,12 +9236,14 @@
+@@ -8015,12 +9247,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12713,7 +12841,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8043,9 +9266,9 @@
+@@ -8043,9 +9277,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12726,7 +12854,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8059,24 +9282,36 @@
+@@ -8059,24 +9293,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12771,15 +12899,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8085,12 +9320,14 @@
+@@ -8085,12 +9331,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -12789,7 +12918,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8105,18 +9342,19 @@
+@@ -8105,18 +9353,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12817,7 +12946,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8127,24 +9365,36 @@
+@@ -8127,24 +9376,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12862,17 +12991,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8153,15 +9403,16 @@
+@@ -8153,15 +9414,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -12884,7 +13014,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8170,8 +9421,13 @@
+@@ -8170,8 +9432,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12900,7 +13030,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8195,9 +9451,10 @@
+@@ -8195,9 +9462,10 @@
ac_header_preproc=no
fi
@@ -12913,7 +13043,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8221,25 +9478,19 @@
+@@ -8221,25 +9489,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;}
@@ -12946,7 +13076,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8251,364 +9502,746 @@
+@@ -8251,364 +9513,746 @@
done
@@ -13606,6 +13736,8 @@
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
+- fi
+- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+# 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`
@@ -13700,7 +13832,7 @@
+ ac_compiler_gnu=no
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+fi
@@ -13763,7 +13895,7 @@
+ ac_cv_prog_f77_g=no
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -13948,8 +14080,8 @@
+hpux*) # Its linker distinguishes data from code symbols
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ fi
++ 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'"
;;
+linux* | k*bsd*-gnu)
@@ -13981,7 +14113,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8626,14 +10259,17 @@
+@@ -8626,14 +10270,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -14001,7 +14133,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8751,15 +10387,15 @@
+@@ -8751,15 +10398,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
@@ -14023,7 +14155,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8773,8 +10409,8 @@
+@@ -8773,8 +10420,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -14034,7 +14166,7 @@
objdir=$lt_cv_objdir
-@@ -8795,7 +10431,7 @@
+@@ -8795,7 +10442,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -14043,7 +14175,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8815,7 +10451,7 @@
+@@ -8815,7 +10462,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -14052,7 +14184,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8825,8 +10461,8 @@
+@@ -8825,8 +10472,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
@@ -14063,7 +14195,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8839,32 +10475,34 @@
+@@ -8839,32 +10486,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14105,7 +14237,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8877,27 +10515,41 @@
+@@ -8877,27 +10526,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14154,7 +14286,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8905,8 +10557,8 @@
+@@ -8905,8 +10568,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
@@ -14165,7 +14297,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8919,32 +10571,34 @@
+@@ -8919,32 +10582,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14207,7 +14339,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8957,27 +10611,41 @@
+@@ -8957,27 +10622,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14256,7 +14388,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8985,8 +10653,8 @@
+@@ -8985,8 +10664,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
@@ -14267,7 +14399,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8999,32 +10667,34 @@
+@@ -8999,32 +10678,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14309,7 +14441,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9037,27 +10707,41 @@
+@@ -9037,27 +10718,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14358,7 +14490,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9072,6 +10756,7 @@
+@@ -9072,6 +10767,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14366,7 +14498,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9091,21 +10776,32 @@
+@@ -9091,21 +10787,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14403,7 +14535,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9125,7 +10821,7 @@
+@@ -9125,7 +10832,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14412,7 +14544,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9157,17 +10853,17 @@
+@@ -9157,17 +10864,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14436,7 +14568,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9187,7 +10883,7 @@
+@@ -9187,7 +10894,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14445,7 +14577,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9219,11 +10915,11 @@
+@@ -9219,11 +10926,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14461,7 +14593,7 @@
fi
else
-@@ -9238,21 +10934,21 @@
+@@ -9238,21 +10945,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14490,7 +14622,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9282,68 +10978,25 @@
+@@ -9282,68 +10989,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14574,7 +14706,7 @@
## CAVEAT EMPTOR:
-@@ -9357,8 +11010,8 @@
+@@ -9357,8 +11021,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14585,7 +14717,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9372,26 +11025,28 @@
+@@ -9372,26 +11036,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 \
@@ -14594,12 +14726,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11031: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11042: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9382: \$? = $ac_status" >&5
-+ echo "$as_me:11035: \$? = $ac_status" >&5
++ echo "$as_me:11046: \$? = $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
@@ -14621,7 +14753,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9405,8 +11060,8 @@
+@@ -9405,8 +11071,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14632,7 +14764,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9444,6 +11099,11 @@
+@@ -9444,6 +11110,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14644,7 +14776,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9460,7 +11120,7 @@
+@@ -9460,7 +11131,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14653,7 +14785,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9486,6 +11146,16 @@
+@@ -9486,6 +11157,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14670,7 +14802,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9497,7 +11167,7 @@
+@@ -9497,7 +11178,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.
@@ -14679,7 +14811,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9520,13 +11190,20 @@
+@@ -9520,13 +11201,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14702,7 +14834,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9541,15 +11218,15 @@
+@@ -9541,15 +11229,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14724,7 +14856,7 @@
;;
sunos4*)
-@@ -9558,7 +11235,7 @@
+@@ -9558,7 +11246,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14733,7 +14865,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9571,6 +11248,17 @@
+@@ -9571,6 +11259,17 @@
fi
;;
@@ -14751,7 +14883,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9582,16 +11270,16 @@
+@@ -9582,16 +11281,16 @@
esac
fi
@@ -14772,7 +14904,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9605,26 +11293,28 @@
+@@ -9605,26 +11304,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 \
@@ -14781,12 +14913,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9611: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11299: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11310: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9615: \$? = $ac_status" >&5
-+ echo "$as_me:11303: \$? = $ac_status" >&5
++ echo "$as_me:11314: \$? = $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
@@ -14808,7 +14940,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9637,7 +11327,7 @@
+@@ -9637,7 +11338,7 @@
fi
fi
@@ -14817,7 +14949,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9647,8 +11337,50 @@
+@@ -9647,8 +11348,50 @@
;;
esac
@@ -14870,7 +15002,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9659,60 +11391,58 @@
+@@ -9659,60 +11402,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14892,12 +15024,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9678: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11403: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11414: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9682: \$? = $ac_status" >&5
-+ echo "$as_me:11407: \$? = $ac_status" >&5
++ echo "$as_me:11418: \$? = $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
@@ -14949,7 +15081,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9722,8 +11452,8 @@
+@@ -9722,8 +11463,8 @@
need_locks=no
fi
@@ -14960,7 +15092,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9761,6 +11491,16 @@
+@@ -9761,6 +11502,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14977,7 +15109,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9771,6 +11511,10 @@
+@@ -9771,6 +11522,10 @@
with_gnu_ld=no
fi
;;
@@ -14988,7 +15120,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9781,6 +11525,27 @@
+@@ -9781,6 +11536,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -15016,7 +15148,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9818,7 +11583,7 @@
+@@ -9818,7 +11594,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -15025,7 +15157,7 @@
else
ld_shlibs=no
fi
-@@ -9828,13 +11593,13 @@
+@@ -9828,13 +11604,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'
@@ -15042,7 +15174,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
-@@ -9843,23 +11608,70 @@
+@@ -9843,23 +11619,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -15118,7 +15250,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9873,13 +11685,40 @@
+@@ -9873,13 +11696,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15161,7 +15293,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9889,24 +11728,19 @@
+@@ -9889,24 +11739,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15193,7 +15325,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9918,7 +11752,7 @@
+@@ -9918,7 +11763,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -15202,7 +15334,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9940,9 +11774,21 @@
+@@ -9940,9 +11785,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
@@ -15226,7 +15358,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9959,7 +11805,7 @@
+@@ -9959,7 +11816,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15235,7 +15367,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`
-@@ -9978,8 +11824,12 @@
+@@ -9978,8 +11835,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15248,7 +15380,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9987,22 +11837,23 @@
+@@ -9987,22 +11848,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15279,7 +15411,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10018,24 +11869,36 @@
+@@ -10018,24 +11880,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15324,14 +15456,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10049,19 +11912,20 @@
+@@ -10049,19 +11923,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15349,7 +15482,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10080,24 +11944,36 @@
+@@ -10080,24 +11955,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15394,17 +15527,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10111,7 +11987,9 @@
+@@ -10111,8 +11998,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10121,13 +11999,11 @@
+
+@@ -10121,13 +12010,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15421,7 +15556,7 @@
fi
fi
;;
-@@ -10140,7 +12016,7 @@
+@@ -10140,7 +12027,7 @@
ld_shlibs=no
;;
@@ -15430,7 +15565,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10150,13 +12026,13 @@
+@@ -10150,13 +12037,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15447,7 +15582,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.
-@@ -10166,52 +12042,52 @@
+@@ -10166,52 +12053,52 @@
;;
darwin* | rhapsody*)
@@ -15540,7 +15675,7 @@
fi
;;
-@@ -10245,8 +12121,8 @@
+@@ -10245,8 +12132,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15551,7 +15686,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10254,7 +12130,7 @@
+@@ -10254,7 +12141,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15560,7 +15695,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
-@@ -10268,47 +12144,62 @@
+@@ -10268,47 +12155,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15647,7 +15782,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10322,7 +12213,7 @@
+@@ -10322,7 +12224,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15656,7 +15791,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'
-@@ -10332,7 +12223,7 @@
+@@ -10332,7 +12234,7 @@
link_all_deplibs=yes
;;
@@ -15665,7 +15800,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10355,7 +12246,8 @@
+@@ -10355,7 +12257,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
@@ -15675,7 +15810,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10365,7 +12257,7 @@
+@@ -10365,7 +12268,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15684,7 +15819,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10376,14 +12268,14 @@
+@@ -10376,14 +12279,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15701,7 +15836,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'
-@@ -10395,13 +12287,13 @@
+@@ -10395,13 +12298,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15717,7 +15852,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10409,21 +12301,15 @@
+@@ -10409,21 +12312,15 @@
hardcode_libdir_separator=:
;;
@@ -15743,7 +15878,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'
-@@ -10432,8 +12318,18 @@
+@@ -10432,8 +12329,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15764,7 +15899,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10442,7 +12338,7 @@
+@@ -10442,7 +12349,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.
@@ -15773,7 +15908,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10490,36 +12386,45 @@
+@@ -10490,36 +12397,45 @@
fi
;;
@@ -15840,7 +15975,7 @@
;;
uts4*)
-@@ -10534,15 +12439,10 @@
+@@ -10534,15 +12450,10 @@
esac
fi
@@ -15858,7 +15993,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10560,8 +12460,8 @@
+@@ -10560,8 +12471,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.
@@ -15869,7 +16004,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10575,6 +12475,7 @@
+@@ -10575,6 +12486,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15877,7 +16012,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10597,20 +12498,20 @@
+@@ -10597,20 +12509,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15903,7 +16038,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10620,7 +12521,20 @@
+@@ -10620,7 +12532,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15925,7 +16060,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10685,7 +12599,7 @@
+@@ -10685,7 +12610,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15934,7 +16069,7 @@
;;
beos*)
-@@ -10694,7 +12608,7 @@
+@@ -10694,7 +12619,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15943,7 +16078,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10710,7 +12624,7 @@
+@@ -10710,7 +12635,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15952,7 +16087,7 @@
need_version=no
need_lib_prefix=no
-@@ -10722,7 +12636,8 @@
+@@ -10722,7 +12647,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15962,7 +16097,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10752,7 +12667,7 @@
+@@ -10752,7 +12678,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15971,7 +16106,7 @@
;;
esac
;;
-@@ -10775,7 +12690,7 @@
+@@ -10775,7 +12701,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15980,7 +16115,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"`
-@@ -10798,20 +12713,17 @@
+@@ -10798,20 +12724,17 @@
dynamic_linker=no
;;
@@ -16012,7 +16147,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10829,14 +12741,19 @@
+@@ -10829,14 +12752,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -16034,7 +16169,7 @@
esac
;;
-@@ -10856,9 +12773,9 @@
+@@ -10856,9 +12784,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -16046,7 +16181,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10873,7 +12790,7 @@
+@@ -10873,7 +12801,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -16055,7 +16190,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10884,7 +12801,7 @@
+@@ -10884,7 +12812,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -16064,7 +16199,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10896,6 +12813,18 @@
+@@ -10896,6 +12824,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16083,7 +16218,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10939,29 +12868,26 @@
+@@ -10939,29 +12879,26 @@
;;
# This must be Linux ELF.
@@ -16120,7 +16255,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,
-@@ -10971,6 +12897,18 @@
+@@ -10971,6 +12908,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16139,7 +16274,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10980,7 +12918,7 @@
+@@ -10980,7 +12929,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16148,7 +16283,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11008,8 +12946,13 @@
+@@ -11008,8 +12957,13 @@
openbsd*)
version_type=sunos
@@ -16163,7 +16298,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
-@@ -11029,7 +12972,7 @@
+@@ -11029,7 +12983,7 @@
os2*)
libname_spec='$name'
@@ -16172,7 +16307,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11047,13 +12990,6 @@
+@@ -11047,13 +13001,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16186,7 +16321,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11079,7 +13015,7 @@
+@@ -11079,7 +13026,7 @@
need_version=yes
;;
@@ -16195,7 +16330,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'
-@@ -11112,6 +13048,29 @@
+@@ -11112,6 +13059,29 @@
fi
;;
@@ -16225,7 +16360,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11123,16 +13082,21 @@
+@@ -11123,16 +13093,21 @@
dynamic_linker=no
;;
esac
@@ -16253,7 +16388,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11152,8 +13116,8 @@
+@@ -11152,8 +13127,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16264,7 +16399,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11166,29 +13130,29 @@
+@@ -11166,29 +13141,29 @@
striplib=
old_striplib=
@@ -16304,7 +16439,7 @@
;;
esac
fi
-@@ -11220,8 +13184,8 @@
+@@ -11220,8 +13195,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16315,7 +16450,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11234,40 +13198,52 @@
+@@ -11234,40 +13209,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16380,15 +16515,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11276,14 +13252,15 @@
+@@ -11276,14 +13263,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16399,7 +16535,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11297,8 +13274,8 @@
+@@ -11297,8 +13285,8 @@
;;
*)
@@ -16410,7 +16546,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11325,53 +13302,59 @@
+@@ -11325,53 +13313,59 @@
#undef shl_load
@@ -16489,15 +16625,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11380,18 +13363,19 @@
+@@ -11380,18 +13374,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16514,7 +16651,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11404,40 +13388,52 @@
+@@ -11404,40 +13399,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16579,15 +16716,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11446,19 +13442,20 @@
+@@ -11446,19 +13453,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16605,7 +16743,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11485,53 +13482,59 @@
+@@ -11485,53 +13493,59 @@
#undef dlopen
@@ -16684,15 +16822,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11540,18 +13543,19 @@
+@@ -11540,18 +13554,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16709,7 +16848,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11564,40 +13568,52 @@
+@@ -11564,40 +13579,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16774,15 +16913,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11606,19 +13622,20 @@
+@@ -11606,19 +13633,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16800,7 +16940,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11631,40 +13648,52 @@
+@@ -11631,40 +13659,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16865,15 +17005,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11673,19 +13702,20 @@
+@@ -11673,19 +13713,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16891,7 +17032,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11698,40 +13728,52 @@
+@@ -11698,40 +13739,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16956,15 +17097,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11740,14 +13782,15 @@
+@@ -11740,14 +13793,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16975,7 +17117,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11782,13 +13825,13 @@
+@@ -11782,13 +13836,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16992,16 +17134,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11798,7 +13841,7 @@
+@@ -11798,7 +13852,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11801 "configure"
-+#line 13844 "configure"
++#line 13855 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11855,6 +13898,8 @@
+@@ -11855,6 +13909,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -17010,7 +17152,7 @@
exit (status);
}
-@@ -11864,12 +13909,12 @@
+@@ -11864,12 +13920,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17025,7 +17167,7 @@
esac
else :
# compilation failed
-@@ -11880,13 +13925,13 @@
+@@ -11880,13 +13936,13 @@
fi
@@ -17044,16 +17186,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11896,7 +13941,7 @@
+@@ -11896,7 +13952,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11899 "configure"
-+#line 13944 "configure"
++#line 13955 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11953,6 +13998,8 @@
+@@ -11953,6 +14009,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -17062,7 +17204,7 @@
exit (status);
}
-@@ -11962,12 +14009,12 @@
+@@ -11962,12 +14020,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17077,7 +17219,7 @@
esac
else :
# compilation failed
-@@ -11978,8 +14025,8 @@
+@@ -11978,8 +14036,8 @@
fi
@@ -17088,7 +17230,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12000,19 +14047,19 @@
+@@ -12000,19 +14058,19 @@
fi
@@ -17116,7 +17258,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12021,58 +14068,21 @@
+@@ -12021,58 +14079,21 @@
fi
;;
@@ -17182,7 +17324,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12087,7 +14097,8 @@
+@@ -12087,7 +14108,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.
@@ -17192,7 +17334,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 \
-@@ -12201,11 +14212,11 @@
+@@ -12201,11 +14223,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17206,7 +17348,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12235,6 +14246,12 @@
+@@ -12235,6 +14257,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17219,7 +17361,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12246,6 +14263,9 @@
+@@ -12246,6 +14274,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17229,7 +17371,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12265,7 +14285,7 @@
+@@ -12265,7 +14296,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17238,7 +17380,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12296,7 +14316,7 @@
+@@ -12296,7 +14327,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17247,7 +17389,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12311,7 +14331,7 @@
+@@ -12311,7 +14342,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17256,7 +17398,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12538,7 +14558,10 @@
+@@ -12538,7 +14569,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.
@@ -17268,7 +17410,7 @@
fi
-@@ -12551,11 +14574,11 @@
+@@ -12551,11 +14585,11 @@
CC="$lt_save_CC"
@@ -17284,7 +17426,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12573,6 +14596,9 @@
+@@ -12573,6 +14607,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17294,7 +17436,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12603,8 +14629,10 @@
+@@ -12603,8 +14640,10 @@
case $tagname in
CXX)
@@ -17307,7 +17449,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12623,6 +14651,7 @@
+@@ -12623,6 +14662,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17315,7 +17457,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12640,7 +14669,7 @@
+@@ -12640,7 +14680,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17324,7 +17466,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12650,17 +14679,34 @@
+@@ -12650,17 +14690,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17360,7 +17502,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12671,18 +14717,27 @@
+@@ -12671,18 +14728,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17391,7 +17533,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12696,18 +14751,18 @@
+@@ -12696,18 +14762,18 @@
# Set up default GNU C++ configuration
@@ -17416,7 +17558,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12736,11 +14791,11 @@
+@@ -12736,11 +14802,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17432,7 +17574,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12753,7 +14808,7 @@
+@@ -12753,7 +14819,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,
@@ -17441,7 +17583,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12773,21 +14828,21 @@
+@@ -12773,21 +14839,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17470,7 +17612,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12797,8 +14852,8 @@
+@@ -12797,8 +14863,8 @@
;;
esac
fi
@@ -17481,7 +17623,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12806,8 +14861,8 @@
+@@ -12806,8 +14872,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
@@ -17492,7 +17634,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12833,7 +14888,7 @@
+@@ -12833,7 +14899,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.
@@ -17501,7 +17643,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12848,8 +14903,8 @@
+@@ -12848,8 +14914,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17512,7 +17654,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12864,8 +14919,23 @@
+@@ -12864,8 +14930,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17538,7 +17680,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12882,7 +14952,7 @@
+@@ -12882,7 +14963,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17547,7 +17689,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`
-@@ -12901,8 +14971,12 @@
+@@ -12901,8 +14982,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17560,7 +17702,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12911,15 +14985,16 @@
+@@ -12911,15 +14996,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17581,7 +17723,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12941,24 +15016,36 @@
+@@ -12941,24 +15027,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17626,14 +17768,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12972,20 +15059,21 @@
+@@ -12972,20 +15070,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17651,7 +17794,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13004,24 +15092,36 @@
+@@ -13004,24 +15103,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17696,17 +17839,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13035,7 +15135,9 @@
+@@ -13035,8 +15146,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13045,16 +15147,26 @@
+
+@@ -13045,16 +15158,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17738,7 +17883,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13068,12 +15180,12 @@
+@@ -13068,12 +15191,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'
@@ -17753,7 +17898,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
-@@ -13082,70 +15194,81 @@
+@@ -13082,70 +15205,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17887,7 +18032,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13156,14 +15279,14 @@
+@@ -13156,14 +15290,14 @@
;;
esac
;;
@@ -17904,7 +18049,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13180,12 +15303,12 @@
+@@ -13180,12 +15314,12 @@
# location of the library.
case $cc_basename in
@@ -17920,7 +18065,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13194,11 +15317,11 @@
+@@ -13194,11 +15328,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.
@@ -17934,7 +18079,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13208,33 +15331,22 @@
+@@ -13208,33 +15342,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17975,7 +18120,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13245,17 +15357,20 @@
+@@ -13245,17 +15368,20 @@
esac
case $cc_basename in
@@ -18002,7 +18147,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13271,12 +15386,15 @@
+@@ -13271,12 +15397,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -18022,7 +18167,7 @@
;;
esac
fi
-@@ -13287,11 +15405,25 @@
+@@ -13287,11 +15416,25 @@
;;
esac
;;
@@ -18050,7 +18195,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13302,9 +15434,9 @@
+@@ -13302,9 +15445,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -18062,7 +18207,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13313,16 +15445,16 @@
+@@ -13313,16 +15456,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -18083,7 +18228,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13340,20 +15472,44 @@
+@@ -13340,20 +15483,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18134,7 +18279,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13381,7 +15537,7 @@
+@@ -13381,7 +15548,7 @@
;;
mvs*)
case $cc_basename in
@@ -18143,7 +18288,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13391,7 +15547,7 @@
+@@ -13391,7 +15558,7 @@
;;
esac
;;
@@ -18152,7 +18297,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=
-@@ -13402,15 +15558,31 @@
+@@ -13402,15 +15569,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::"'
;;
@@ -18186,7 +18331,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13420,14 +15592,14 @@
+@@ -13420,14 +15603,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18204,7 +18349,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13445,7 +15617,7 @@
+@@ -13445,7 +15628,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18213,7 +18358,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13464,13 +15636,13 @@
+@@ -13464,13 +15647,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18229,7 +18374,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13479,17 +15651,17 @@
+@@ -13479,17 +15662,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18251,7 +18396,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13508,7 +15680,7 @@
+@@ -13508,7 +15691,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18260,7 +18405,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13529,27 +15701,14 @@
+@@ -13529,27 +15712,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18290,7 +18435,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13562,36 +15721,33 @@
+@@ -13562,36 +15732,33 @@
;;
solaris*)
case $cc_basename in
@@ -18339,7 +18484,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13599,9 +15755,9 @@
+@@ -13599,9 +15766,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18351,7 +18496,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13611,9 +15767,9 @@
+@@ -13611,9 +15778,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
@@ -18363,7 +18508,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13622,9 +15778,9 @@
+@@ -13622,9 +15789,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18375,7 +18520,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13637,12 +15793,63 @@
+@@ -13637,12 +15804,63 @@
;;
esac
;;
@@ -18441,7 +18586,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13662,8 +15869,8 @@
+@@ -13662,8 +15880,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18452,7 +18597,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13699,7 +15906,7 @@
+@@ -13699,7 +15917,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.
@@ -18461,7 +18606,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13739,7 +15946,7 @@
+@@ -13739,7 +15957,7 @@
fi
;;
@@ -18470,7 +18615,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13775,6 +15982,29 @@
+@@ -13775,6 +15993,29 @@
$rm -f confest.$objext
@@ -18500,7 +18645,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13783,8 +16013,8 @@
+@@ -13783,8 +16024,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18511,7 +18656,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13822,6 +16052,10 @@
+@@ -13822,6 +16063,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18522,7 +18667,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13830,7 +16064,7 @@
+@@ -13830,7 +16075,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18531,7 +18676,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13855,18 +16089,28 @@
+@@ -13855,18 +16100,28 @@
;;
chorus*)
case $cc_basename in
@@ -18563,7 +18708,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13874,22 +16118,22 @@
+@@ -13874,22 +16129,22 @@
;;
esac
;;
@@ -18592,7 +18737,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13902,9 +16146,13 @@
+@@ -13902,9 +16157,13 @@
;;
esac
;;
@@ -18607,7 +18752,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13913,20 +16161,26 @@
+@@ -13913,20 +16172,26 @@
;;
esac
;;
@@ -18638,7 +18783,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13943,25 +16197,25 @@
+@@ -13943,25 +16208,25 @@
;;
mvs*)
case $cc_basename in
@@ -18669,7 +18814,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13975,24 +16229,15 @@
+@@ -13975,24 +16240,15 @@
;;
psos*)
;;
@@ -18696,7 +18841,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14002,12 +16247,12 @@
+@@ -14002,12 +16258,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18711,7 +18856,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14017,7 +16262,7 @@
+@@ -14017,7 +16273,7 @@
;;
tandem*)
case $cc_basename in
@@ -18720,7 +18865,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14025,7 +16270,14 @@
+@@ -14025,7 +16281,14 @@
;;
esac
;;
@@ -18736,7 +18881,7 @@
;;
vxworks*)
;;
-@@ -14035,16 +16287,16 @@
+@@ -14035,16 +16298,16 @@
esac
fi
@@ -18757,7 +18902,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14058,26 +16310,28 @@
+@@ -14058,26 +16321,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 \
@@ -18766,12 +18911,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14064: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16316: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16327: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14068: \$? = $ac_status" >&5
-+ echo "$as_me:16320: \$? = $ac_status" >&5
++ echo "$as_me:16331: \$? = $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
@@ -18793,7 +18938,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14090,7 +16344,7 @@
+@@ -14090,7 +16355,7 @@
fi
fi
@@ -18802,7 +18947,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14100,8 +16354,50 @@
+@@ -14100,8 +16365,50 @@
;;
esac
@@ -18855,7 +19000,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14112,60 +16408,58 @@
+@@ -14112,60 +16419,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18877,12 +19022,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16420: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16431: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14135: \$? = $ac_status" >&5
-+ echo "$as_me:16424: \$? = $ac_status" >&5
++ echo "$as_me:16435: \$? = $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
@@ -18934,7 +19079,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14175,8 +16469,8 @@
+@@ -14175,8 +16480,8 @@
need_locks=no
fi
@@ -18945,7 +19090,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14193,22 +16487,20 @@
+@@ -14193,22 +16498,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18974,7 +19119,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14226,8 +16518,8 @@
+@@ -14226,8 +16529,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.
@@ -18985,7 +19130,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14241,6 +16533,7 @@
+@@ -14241,6 +16544,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18993,7 +19138,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14263,20 +16556,20 @@
+@@ -14263,20 +16567,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -19019,7 +19164,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14286,7 +16579,20 @@
+@@ -14286,7 +16590,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19041,7 +19186,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14351,7 +16657,7 @@
+@@ -14351,7 +16668,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19050,7 +19195,7 @@
;;
beos*)
-@@ -14360,7 +16666,7 @@
+@@ -14360,7 +16677,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -19059,7 +19204,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14376,7 +16682,7 @@
+@@ -14376,7 +16693,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -19068,7 +19213,7 @@
need_version=no
need_lib_prefix=no
-@@ -14388,7 +16694,8 @@
+@@ -14388,7 +16705,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -19078,7 +19223,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14418,7 +16725,7 @@
+@@ -14418,7 +16736,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19087,7 +19232,7 @@
;;
esac
;;
-@@ -14441,7 +16748,7 @@
+@@ -14441,7 +16759,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -19096,7 +19241,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"`
-@@ -14464,20 +16771,17 @@
+@@ -14464,20 +16782,17 @@
dynamic_linker=no
;;
@@ -19128,7 +19273,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14495,14 +16799,19 @@
+@@ -14495,14 +16810,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19150,7 +19295,7 @@
esac
;;
-@@ -14522,9 +16831,9 @@
+@@ -14522,9 +16842,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19162,7 +19307,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14539,7 +16848,7 @@
+@@ -14539,7 +16859,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19171,7 +19316,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14550,7 +16859,7 @@
+@@ -14550,7 +16870,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19180,7 +19325,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14562,6 +16871,18 @@
+@@ -14562,6 +16882,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19199,7 +19344,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14605,29 +16926,26 @@
+@@ -14605,29 +16937,26 @@
;;
# This must be Linux ELF.
@@ -19236,7 +19381,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,
-@@ -14637,6 +16955,18 @@
+@@ -14637,6 +16966,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19255,7 +19400,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14646,7 +16976,7 @@
+@@ -14646,7 +16987,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19264,7 +19409,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14674,8 +17004,13 @@
+@@ -14674,8 +17015,13 @@
openbsd*)
version_type=sunos
@@ -19279,7 +19424,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
-@@ -14695,7 +17030,7 @@
+@@ -14695,7 +17041,7 @@
os2*)
libname_spec='$name'
@@ -19288,7 +19433,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14713,13 +17048,6 @@
+@@ -14713,13 +17059,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19302,7 +19447,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14745,7 +17073,7 @@
+@@ -14745,7 +17084,7 @@
need_version=yes
;;
@@ -19311,7 +19456,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'
-@@ -14778,6 +17106,29 @@
+@@ -14778,6 +17117,29 @@
fi
;;
@@ -19341,7 +19486,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14789,16 +17140,21 @@
+@@ -14789,16 +17151,21 @@
dynamic_linker=no
;;
esac
@@ -19369,7 +19514,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14818,8 +17174,8 @@
+@@ -14818,8 +17185,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19380,7 +19525,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14830,1266 +17186,444 @@
+@@ -14830,1266 +17197,444 @@
enable_fast_install=needless
fi
@@ -20506,9 +20651,7 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
@@ -20530,169 +20673,174 @@
- ;;
- esac
- done
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
+-cfgfile="$ofile"
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
--cfgfile="$ofile"
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# 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
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+# 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
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
--# 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_CXX
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
--# The host system.
--host_alias=$host_alias
--host=$host
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+# 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_CXX
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+# 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_CXX
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# A C compiler.
+-LTCC=$lt_LTCC
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--# A C compiler.
--LTCC=$lt_LTCC
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+# 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_CXX
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# A symbol stripping program
+-STRIP=$STRIP
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--# A symbol stripping program
--STRIP=$STRIP
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: assembler.
+-AS="$AS"
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
--# Used on cygwin: assembler.
--AS="$AS"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# ### END LIBTOOL TAG CONFIG: $tagname
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+__EOF__
++# ### END LIBTOOL TAG CONFIG: $tagname
-# Old archive suffix (normally "a").
-libext="$libext"
++__EOF__
-# Shared library suffix (normally ".so").
-shrext='$shrext'
+
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+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
@@ -20703,20 +20851,20 @@
+ fi
+fi
--# Executable file suffix (normally "").
--exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
+
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+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
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
@@ -20728,21 +20876,18 @@
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+ else
+ tagname=""
+ 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
+ F77)
+ if test -n "$F77" && test "X$F77" != "Xno"; then
--# 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
-
@@ -20979,7 +21124,7 @@
archive_cmds_need_lc_F77=no
-@@ -16129,29 +17663,55 @@
+@@ -16129,29 +17674,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -21019,19 +21164,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-+
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -21043,7 +21188,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16159,21 +17719,21 @@
+@@ -16159,21 +17730,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -21075,7 +21220,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16182,8 +17742,8 @@
+@@ -16182,8 +17753,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -21086,7 +21231,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16221,6 +17781,11 @@
+@@ -16221,6 +17792,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -21098,7 +21243,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16237,7 +17802,7 @@
+@@ -16237,7 +17813,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -21107,7 +21252,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16263,6 +17828,16 @@
+@@ -16263,6 +17839,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -21124,7 +21269,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16274,7 +17849,7 @@
+@@ -16274,7 +17860,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.
@@ -21133,7 +21278,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16297,13 +17872,20 @@
+@@ -16297,13 +17883,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21156,7 +21301,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16318,15 +17900,15 @@
+@@ -16318,15 +17911,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -21178,7 +21323,7 @@
;;
sunos4*)
-@@ -16335,7 +17917,7 @@
+@@ -16335,7 +17928,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21187,32 +21332,39 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16348,7 +17930,18 @@
+@@ -16348,27 +17941,38 @@
fi
;;
- uts4*)
+- lt_prog_compiler_pic_F77='-pic'
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- *)
++ unicos*)
++ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+- esac
+- fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++ uts4*)
++ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
-+ unicos*)
-+ lt_prog_compiler_wl_F77='-Wl,'
++ *)
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
++ esac
++ fi
+
-+ uts4*)
- lt_prog_compiler_pic_F77='-pic'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-@@ -16359,16 +17952,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; }
@@ -21228,7 +21380,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16382,26 +17975,28 @@
+@@ -16382,26 +17986,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 \
@@ -21237,12 +21389,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16388: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17981: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17992: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16392: \$? = $ac_status" >&5
-+ echo "$as_me:17985: \$? = $ac_status" >&5
++ echo "$as_me:17996: \$? = $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
@@ -21264,7 +21416,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16414,7 +18009,7 @@
+@@ -16414,7 +18020,7 @@
fi
fi
@@ -21273,7 +21425,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16424,8 +18019,50 @@
+@@ -16424,8 +18030,50 @@
;;
esac
@@ -21326,7 +21478,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16436,60 +18073,58 @@
+@@ -16436,60 +18084,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -21348,12 +21500,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16455: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18085: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16459: \$? = $ac_status" >&5
-+ echo "$as_me:18089: \$? = $ac_status" >&5
++ echo "$as_me:18100: \$? = $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
@@ -21405,7 +21557,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16499,8 +18134,8 @@
+@@ -16499,8 +18145,8 @@
need_locks=no
fi
@@ -21416,7 +21568,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16538,6 +18173,16 @@
+@@ -16538,6 +18184,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -21433,7 +21585,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16548,6 +18193,10 @@
+@@ -16548,6 +18204,10 @@
with_gnu_ld=no
fi
;;
@@ -21444,7 +21596,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16558,6 +18207,27 @@
+@@ -16558,6 +18218,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -21472,7 +21624,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16595,7 +18265,7 @@
+@@ -16595,7 +18276,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -21481,7 +21633,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16605,13 +18275,13 @@
+@@ -16605,13 +18286,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'
@@ -21498,7 +21650,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
-@@ -16620,23 +18290,70 @@
+@@ -16620,23 +18301,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21575,7 +21727,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16650,13 +18367,40 @@
+@@ -16650,13 +18378,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21618,7 +21770,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16666,24 +18410,19 @@
+@@ -16666,24 +18421,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21650,7 +21802,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16695,7 +18434,7 @@
+@@ -16695,7 +18445,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21659,7 +21811,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16717,9 +18456,21 @@
+@@ -16717,9 +18467,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
@@ -21683,7 +21835,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16736,7 +18487,7 @@
+@@ -16736,7 +18498,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21692,7 +21844,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`
-@@ -16755,8 +18506,12 @@
+@@ -16755,8 +18517,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21705,7 +21857,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16764,45 +18519,58 @@
+@@ -16764,45 +18530,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21779,14 +21931,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16816,19 +18584,20 @@
+@@ -16816,19 +18595,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -21804,7 +21957,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16837,24 +18606,36 @@
+@@ -16837,24 +18617,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21849,17 +22002,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16868,7 +18649,9 @@
+@@ -16868,8 +18660,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16878,13 +18661,11 @@
+
+@@ -16878,13 +18672,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21876,7 +22031,7 @@
fi
fi
;;
-@@ -16897,7 +18678,7 @@
+@@ -16897,7 +18689,7 @@
ld_shlibs_F77=no
;;
@@ -21885,7 +22040,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16907,68 +18688,68 @@
+@@ -16907,68 +18699,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21998,7 +22153,7 @@
fi
;;
-@@ -17002,8 +18783,8 @@
+@@ -17002,8 +18794,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22009,7 +22164,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17011,7 +18792,7 @@
+@@ -17011,7 +18803,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -22018,7 +22173,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
-@@ -17025,47 +18806,62 @@
+@@ -17025,47 +18817,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -22087,25 +22242,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'
-@@ -17079,7 +18875,7 @@
+@@ -17079,7 +18886,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -22114,7 +22269,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'
-@@ -17089,7 +18885,7 @@
+@@ -17089,7 +18896,7 @@
link_all_deplibs_F77=yes
;;
@@ -22123,7 +22278,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
-@@ -17112,7 +18908,8 @@
+@@ -17112,7 +18919,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
@@ -22133,7 +22288,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17122,7 +18919,7 @@
+@@ -17122,7 +18930,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -22142,7 +22297,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17133,14 +18930,14 @@
+@@ -17133,14 +18941,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -22159,7 +22314,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'
-@@ -17152,13 +18949,13 @@
+@@ -17152,13 +18960,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -22175,7 +22330,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17166,21 +18963,15 @@
+@@ -17166,21 +18974,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -22201,7 +22356,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'
-@@ -17189,8 +18980,18 @@
+@@ -17189,8 +18991,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22222,7 +22377,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17199,7 +19000,7 @@
+@@ -17199,7 +19011,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.
@@ -22231,7 +22386,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17247,36 +19048,45 @@
+@@ -17247,36 +19059,45 @@
fi
;;
@@ -22298,7 +22453,7 @@
;;
uts4*)
-@@ -17291,15 +19101,10 @@
+@@ -17291,15 +19112,10 @@
esac
fi
@@ -22316,7 +22471,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17317,8 +19122,8 @@
+@@ -17317,8 +19133,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.
@@ -22327,7 +22482,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17332,6 +19137,7 @@
+@@ -17332,6 +19148,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -22335,7 +22490,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17354,20 +19160,20 @@
+@@ -17354,20 +19171,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -22361,7 +22516,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17377,7 +19183,20 @@
+@@ -17377,7 +19194,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22383,7 +22538,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17442,7 +19261,7 @@
+@@ -17442,7 +19272,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22392,7 +22547,7 @@
;;
beos*)
-@@ -17451,7 +19270,7 @@
+@@ -17451,7 +19281,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -22401,7 +22556,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17467,7 +19286,7 @@
+@@ -17467,7 +19297,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -22410,7 +22565,7 @@
need_version=no
need_lib_prefix=no
-@@ -17479,7 +19298,8 @@
+@@ -17479,7 +19309,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -22420,7 +22575,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17509,7 +19329,7 @@
+@@ -17509,7 +19340,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22429,7 +22584,7 @@
;;
esac
;;
-@@ -17532,7 +19352,7 @@
+@@ -17532,7 +19363,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -22438,7 +22593,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"`
-@@ -17555,20 +19375,17 @@
+@@ -17555,20 +19386,17 @@
dynamic_linker=no
;;
@@ -22470,7 +22625,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17586,14 +19403,19 @@
+@@ -17586,14 +19414,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -22492,7 +22647,7 @@
esac
;;
-@@ -17613,9 +19435,9 @@
+@@ -17613,9 +19446,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -22504,7 +22659,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17630,7 +19452,7 @@
+@@ -17630,7 +19463,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -22513,7 +22668,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17641,7 +19463,7 @@
+@@ -17641,7 +19474,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -22522,7 +22677,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17653,6 +19475,18 @@
+@@ -17653,6 +19486,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22541,7 +22696,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17696,29 +19530,26 @@
+@@ -17696,29 +19541,26 @@
;;
# This must be Linux ELF.
@@ -22578,7 +22733,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,
-@@ -17728,6 +19559,18 @@
+@@ -17728,6 +19570,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22597,7 +22752,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17737,7 +19580,7 @@
+@@ -17737,7 +19591,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22606,7 +22761,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17765,8 +19608,13 @@
+@@ -17765,8 +19619,13 @@
openbsd*)
version_type=sunos
@@ -22621,7 +22776,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
-@@ -17786,7 +19634,7 @@
+@@ -17786,7 +19645,7 @@
os2*)
libname_spec='$name'
@@ -22630,7 +22785,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17804,13 +19652,6 @@
+@@ -17804,13 +19663,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22644,7 +22799,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17836,7 +19677,7 @@
+@@ -17836,7 +19688,7 @@
need_version=yes
;;
@@ -22653,7 +22808,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'
-@@ -17869,27 +19710,55 @@
+@@ -17869,27 +19721,55 @@
fi
;;
@@ -22665,13 +22820,8 @@
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-- ;;
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -22691,9 +22841,13 @@
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+
+*)
+ dynamic_linker=no
@@ -22723,7 +22877,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17909,8 +19778,8 @@
+@@ -17909,8 +19789,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22734,7 +22888,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17921,36 +19790,6 @@
+@@ -17921,36 +19801,6 @@
enable_fast_install=needless
fi
@@ -22771,7 +22925,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17965,7 +19804,8 @@
+@@ -17965,7 +19815,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.
@@ -22781,7 +22935,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 \
-@@ -18065,6 +19905,12 @@
+@@ -18065,6 +19916,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22794,7 +22948,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18076,6 +19922,9 @@
+@@ -18076,6 +19933,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22804,7 +22958,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18095,7 +19944,7 @@
+@@ -18095,7 +19955,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22813,7 +22967,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18126,7 +19975,7 @@
+@@ -18126,7 +19986,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22822,7 +22976,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18141,7 +19990,7 @@
+@@ -18141,7 +20001,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22831,7 +22985,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18343,7 +20192,10 @@
+@@ -18343,7 +20203,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.
@@ -22843,7 +22997,7 @@
fi
-@@ -18364,7 +20216,6 @@
+@@ -18364,7 +20227,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22851,7 +23005,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18376,26 +20227,55 @@
+@@ -18376,26 +20238,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22908,7 +23062,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18407,8 +20287,8 @@
+@@ -18407,8 +20298,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22919,7 +23073,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18422,26 +20302,28 @@
+@@ -18422,26 +20313,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 \
@@ -22928,12 +23082,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20308: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20319: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18432: \$? = $ac_status" >&5
-+ echo "$as_me:20312: \$? = $ac_status" >&5
++ echo "$as_me:20323: \$? = $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
@@ -22955,7 +23109,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18455,8 +20337,8 @@
+@@ -18455,8 +20348,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22966,7 +23120,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18494,6 +20376,11 @@
+@@ -18494,6 +20387,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22978,7 +23132,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18510,7 +20397,7 @@
+@@ -18510,7 +20408,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22987,7 +23141,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18536,6 +20423,16 @@
+@@ -18536,6 +20434,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -23004,7 +23158,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18547,7 +20444,7 @@
+@@ -18547,7 +20455,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.
@@ -23013,7 +23167,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18570,13 +20467,20 @@
+@@ -18570,13 +20478,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -23036,7 +23190,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18591,15 +20495,15 @@
+@@ -18591,15 +20506,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -23058,7 +23212,7 @@
;;
sunos4*)
-@@ -18608,7 +20512,7 @@
+@@ -18608,7 +20523,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -23067,7 +23221,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18621,6 +20525,17 @@
+@@ -18621,6 +20536,17 @@
fi
;;
@@ -23085,7 +23239,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18632,16 +20547,16 @@
+@@ -18632,16 +20558,16 @@
esac
fi
@@ -23106,7 +23260,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18655,26 +20570,28 @@
+@@ -18655,26 +20581,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 \
@@ -23115,12 +23269,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18661: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20576: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20587: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18665: \$? = $ac_status" >&5
-+ echo "$as_me:20580: \$? = $ac_status" >&5
++ echo "$as_me:20591: \$? = $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
@@ -23142,7 +23296,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18687,7 +20604,7 @@
+@@ -18687,7 +20615,7 @@
fi
fi
@@ -23151,7 +23305,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18697,8 +20614,50 @@
+@@ -18697,8 +20625,50 @@
;;
esac
@@ -23204,7 +23358,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18709,60 +20668,58 @@
+@@ -18709,60 +20679,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -23226,12 +23380,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18728: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20680: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18732: \$? = $ac_status" >&5
-+ echo "$as_me:20684: \$? = $ac_status" >&5
++ echo "$as_me:20695: \$? = $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
@@ -23283,7 +23437,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18772,8 +20729,8 @@
+@@ -18772,8 +20740,8 @@
need_locks=no
fi
@@ -23294,7 +23448,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18811,6 +20768,16 @@
+@@ -18811,6 +20779,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -23311,7 +23465,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18821,6 +20788,10 @@
+@@ -18821,6 +20799,10 @@
with_gnu_ld=no
fi
;;
@@ -23322,7 +23476,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18831,6 +20802,27 @@
+@@ -18831,6 +20813,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -23350,7 +23504,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18868,7 +20860,7 @@
+@@ -18868,7 +20871,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -23359,7 +23513,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18878,13 +20870,13 @@
+@@ -18878,13 +20881,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'
@@ -23376,7 +23530,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
-@@ -18893,23 +20885,70 @@
+@@ -18893,23 +20896,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -23453,7 +23607,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18923,13 +20962,40 @@
+@@ -18923,13 +20973,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23496,7 +23650,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18939,24 +21005,19 @@
+@@ -18939,24 +21016,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23528,7 +23682,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18968,7 +21029,7 @@
+@@ -18968,7 +21040,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -23537,7 +23691,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18990,9 +21051,21 @@
+@@ -18990,9 +21062,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
@@ -23561,7 +23715,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19009,7 +21082,7 @@
+@@ -19009,7 +21093,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -23570,7 +23724,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`
-@@ -19028,8 +21101,12 @@
+@@ -19028,8 +21112,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23583,7 +23737,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19037,22 +21114,23 @@
+@@ -19037,22 +21125,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23614,7 +23768,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19068,24 +21146,36 @@
+@@ -19068,24 +21157,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23659,14 +23813,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19099,19 +21189,20 @@
+@@ -19099,19 +21200,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23684,7 +23839,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19130,24 +21221,36 @@
+@@ -19130,24 +21232,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23729,17 +23884,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19161,7 +21264,9 @@
+@@ -19161,8 +21275,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19171,13 +21276,11 @@
+
+@@ -19171,13 +21287,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23756,7 +23913,7 @@
fi
fi
;;
-@@ -19190,7 +21293,7 @@
+@@ -19190,7 +21304,7 @@
ld_shlibs_GCJ=no
;;
@@ -23765,7 +23922,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19200,68 +21303,68 @@
+@@ -19200,68 +21314,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23878,7 +24035,7 @@
fi
;;
-@@ -19295,8 +21398,8 @@
+@@ -19295,8 +21409,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23889,7 +24046,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19304,7 +21407,7 @@
+@@ -19304,7 +21418,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23898,7 +24055,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
-@@ -19318,47 +21421,62 @@
+@@ -19318,47 +21432,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23985,7 +24142,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19372,7 +21490,7 @@
+@@ -19372,7 +21501,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23994,7 +24151,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'
-@@ -19382,7 +21500,7 @@
+@@ -19382,7 +21511,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -24003,7 +24160,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
-@@ -19405,7 +21523,8 @@
+@@ -19405,7 +21534,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
@@ -24013,7 +24170,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19415,7 +21534,7 @@
+@@ -19415,7 +21545,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -24022,7 +24179,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19426,14 +21545,14 @@
+@@ -19426,14 +21556,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -24039,7 +24196,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'
-@@ -19445,13 +21564,13 @@
+@@ -19445,13 +21575,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -24055,7 +24212,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19459,21 +21578,15 @@
+@@ -19459,21 +21589,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -24081,7 +24238,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'
-@@ -19482,8 +21595,18 @@
+@@ -19482,8 +21606,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -24102,7 +24259,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19492,7 +21615,7 @@
+@@ -19492,7 +21626,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.
@@ -24111,7 +24268,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19540,36 +21663,45 @@
+@@ -19540,36 +21674,45 @@
fi
;;
@@ -24178,7 +24335,7 @@
;;
uts4*)
-@@ -19584,1469 +21716,693 @@
+@@ -19584,15 +21727,10 @@
esac
fi
@@ -24196,258 +24353,132 @@
#
# Do we need to explicitly link libc?
#
- case "x$archive_cmds_need_lc_GCJ" in
- x|xyes)
-- # Assume -lc should be added
-- archive_cmds_need_lc_GCJ=yes
--
-- if test "$enable_shared" = yes && test "$GCC" = yes; then
-- case $archive_cmds_GCJ in
-- *'~'*)
-- # FIXME: we may have to deal with multi-command sequences.
-- ;;
-- '$CC '*)
-- # 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.
+@@ -19610,8 +21748,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
-- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- 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); } 2>conftest.err; then
-- soname=conftest
-- lib=conftest
-- libobjs=conftest.$ac_objext
-- deplibs=
-- wl=$lt_prog_compiler_wl_GCJ
-- compiler_flags=-v
-- linker_flags=-v
-- verstring=
-- output_objdir=.
-- libname=conftest
-- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-- allow_undefined_flag_GCJ=
-- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-- then
-- archive_cmds_need_lc_GCJ=no
-- else
-- archive_cmds_need_lc_GCJ=yes
-- fi
-- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-- else
-- cat conftest.err 1>&5
-- fi
-- $rm conftest*
++ { 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
+
+@@ -19625,6 +21763,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_GCJ
++ pic_flag=$lt_prog_compiler_pic_GCJ
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -19647,20 +21786,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
-- ;;
-- esac
-- fi
-- ;;
--esac
--
++ { 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
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
++{ 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=
-shrext=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19670,7 +21809,20 @@
+ 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
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-- shlibpath_var=LIBPATH
--
-- # AIX 3 has no versioning support, so we append a major version to the name.
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
--
--aix4* | aix5*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- hardcode_into_libs=yes
-- if test "$host_cpu" = ia64; then
-- # AIX 5 supports IA64
-- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- else
-- # With GCC up to 2.95.x, collect2 would create an import file
-- # for dependence libraries. The import file would start with
-- # the line `#! .'. This would cause the generated library to
-- # depend on `.', always an invalid library. This was fixed in
-- # development snapshots of GCC prior to 3.0.
-- case $host_os in
-- aix4 | aix4.[01] | aix4.[01].*)
-- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-- echo ' yes '
-- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-- :
-- else
-- can_build_shared=no
-- fi
-- ;;
-- esac
-- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-- # soname into executable. Probably we can add versioning support to
-- # collect2, so additional links can be useful in future.
-- if test "$aix_use_runtimelinking" = yes; then
-- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-- # instead of lib<name>.a to let people know that these are not
-- # typical AIX shared libraries.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- else
-- # We preserve .a as extension for shared libraries through AIX4.2
-- # and later when we are not doing run time linking.
-- library_names_spec='${libname}${release}.a $libname.a'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- fi
-- shlibpath_var=LIBPATH
-- fi
-- ;;
--
--amigaos*)
-- library_names_spec='$libname.ixlibrary $libname.a'
-- # Create ${libname}_ixlibrary.a entries in /sys/libs.
++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
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -19735,7 +21887,7 @@
+ amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-- ;;
--
--beos*)
-- library_names_spec='${libname}${shared_ext}'
-- dynamic_linker="$host_os ld.so"
-- shlibpath_var=LIBRARY_PATH
-- ;;
--
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+ beos*)
+@@ -19744,7 +21896,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
-bsdi4*)
-- version_type=linux
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-- # the default ld.so.conf also contains /usr/contrib/lib and
-- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-- # libtool to hard-code these into programs
-- ;;
--
--cygwin* | mingw* | pw32*)
-- version_type=windows
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19760,7 +21912,7 @@
+
+ cygwin* | mingw* | pw32*)
+ version_type=windows
- shrext=".dll"
-- need_version=no
-- need_lib_prefix=no
--
-- case $GCC,$host_os in
-- yes,cygwin* | yes,mingw* | yes,pw32*)
-- library_names_spec='$libname.dll.a'
-- # DLL is installed to $(libdir)/../bin by postinstall_cmds
-- postinstall_cmds='base_file=`basename \${file}`~
-- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-- dldir=$destdir/`dirname \$dlpath`~
-- test -d \$dldir || mkdir -p \$dldir~
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -19772,7 +21924,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
-- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-- dlpath=$dir/\$dldll~
-- $rm \$dlpath'
-- shlibpath_overrides_runpath=yes
--
-- case $host_os in
-- cygwin*)
-- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-- ;;
-- mingw*)
-- # MinGW DLLs use traditional 'lib' prefix
-- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-- 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 ';[c-zC-Z]:/' >/dev/null; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
-- ;;
-- pw32*)
-- # pw32 DLLs use 'pw' prefix rather than 'lib'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -19802,7 +21955,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-- ;;
-- esac
-- ;;
--
-- *)
-- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-- ;;
-- esac
-- dynamic_linker='Win32 ld.exe'
-- # FIXME: first we should search . and the directory the executable is in
-- shlibpath_var=PATH
-- ;;
--
--darwin* | rhapsody*)
-- dynamic_linker="$host_os dyld"
-- version_type=darwin
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-- soname_spec='${libname}${release}${major}$shared_ext'
-- shlibpath_overrides_runpath=yes
-- shlibpath_var=DYLD_LIBRARY_PATH
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -19825,7 +21978,7 @@
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-- # 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"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-- ;;
--
--dgux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ # 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"`
+@@ -19848,20 +22001,17 @@
+ dynamic_linker=no
+ ;;
+
-kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
@@ -24462,90 +24493,76 @@
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-- need_version=no
-- need_lib_prefix=no
-- ;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-- need_version=yes
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_os in
-- freebsd2*)
-- shlibpath_overrides_runpath=yes
-- ;;
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -19879,14 +22029,19 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
- freebsd3.01* | freebsdelf3.01*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
- *) # from 3.2 on
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- ;;
-- esac
-- ;;
--
--gnu*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- hardcode_into_libs=yes
-- ;;
--
--hpux9* | hpux10* | hpux11*)
-- # Give a soname corresponding to the major version so that dld.sl refuses to
-- # link against other versions.
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -19906,9 +22061,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
- case "$host_cpu" in
-- ia64*)
++ case $host_cpu in
+ ia64*)
- shrext='.so'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.so"
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- if test "X$HPUX_IA64_MODE" = X32; then
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-- else
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-- fi
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- hppa*64*)
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -19923,7 +22078,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
- shrext='.sl'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- *)
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19934,7 +22089,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
- shrext='.sl'
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=SHLIB_PATH
-- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
-- esac
-- # HP-UX runs *really* slowly unless shared libraries are mode 555.
-- postinstall_cmds='chmod 555 $lib'
-- ;;
--
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19946,1107 +22101,319 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
@@ -24590,11 +24607,13 @@
-
-# This must be Linux ELF.
-linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
++interix3*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
@@ -24603,8 +24622,9 @@
- libsuff=64
- fi
- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
@@ -24712,7 +24732,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
+ hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
@@ -24771,7 +24791,7 @@
-
-*)
- dynamic_linker=no
-- ;;
+ ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
@@ -25376,73 +25396,20 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_GCJ=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_GCJ in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # 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; }
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&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); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_GCJ
-+ pic_flag=$lt_prog_compiler_pic_GCJ
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-+ allow_undefined_flag_GCJ=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_GCJ=no
-+ else
-+ archive_cmds_need_lc_GCJ=yes
-+ fi
-+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+ else
-+ 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; }
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-
+-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -25453,260 +25420,58 @@
-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"
-+{ 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=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+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
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-
-fi
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-
+-
+-
-fi
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-
+-
+-
-fi
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-
+-
+-
-fi
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
+-
+-
+-fi
+-
+-
+-fi
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-
--fi
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ 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 ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+ # 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"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[123]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
;;
esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
+ ;;
- if test "x$lt_cv_dlopen" != xno; then
@@ -25725,16 +25490,7 @@
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-
+-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -25748,105 +25504,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 20851 "configure"
-#include "confdefs.h"
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case $host_cpu in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-
+-
-#include <stdio.h>
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -26280,7 +25944,7 @@
fi
-@@ -21063,7 +22419,8 @@
+@@ -21063,7 +22430,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.
@@ -26290,7 +25954,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 \
-@@ -21163,6 +22520,12 @@
+@@ -21163,6 +22531,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26303,7 +25967,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21174,6 +22537,9 @@
+@@ -21174,6 +22548,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26313,7 +25977,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21193,7 +22559,7 @@
+@@ -21193,7 +22570,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26322,7 +25986,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21224,7 +22590,7 @@
+@@ -21224,7 +22601,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26331,7 +25995,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21239,7 +22605,7 @@
+@@ -21239,7 +22616,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -26340,7 +26004,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21441,7 +22807,10 @@
+@@ -21441,7 +22818,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.
@@ -26352,7 +26016,7 @@
fi
-@@ -21461,7 +22830,6 @@
+@@ -21461,7 +22841,6 @@
RC)
@@ -26360,7 +26024,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21480,15 +22848,42 @@
+@@ -21480,15 +22859,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -26403,7 +26067,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21504,7 +22899,8 @@
+@@ -21504,7 +22910,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.
@@ -26413,7 +26077,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 \
-@@ -21604,6 +23000,12 @@
+@@ -21604,6 +23011,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26426,7 +26090,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21615,6 +23017,9 @@
+@@ -21615,6 +23028,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26436,7 +26100,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21634,7 +23039,7 @@
+@@ -21634,7 +23050,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26445,7 +26109,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21665,7 +23070,7 @@
+@@ -21665,7 +23081,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26454,7 +26118,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21680,7 +23085,7 @@
+@@ -21680,7 +23096,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -26463,7 +26127,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21882,7 +23287,10 @@
+@@ -21882,7 +23298,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.
@@ -26475,7 +26139,7 @@
fi
-@@ -21929,7 +23337,7 @@
+@@ -21929,7 +23348,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -26484,7 +26148,7 @@
# Prevent multiple expansion
-@@ -21984,8 +23392,8 @@
+@@ -21984,8 +23403,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -26495,7 +26159,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22011,17 +23419,17 @@
+@@ -22011,17 +23430,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -26519,7 +26183,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22036,32 +23444,33 @@
+@@ -22036,32 +23455,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26561,7 +26225,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22070,8 +23479,8 @@
+@@ -22070,8 +23490,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -26572,7 +26236,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22097,11 +23506,11 @@
+@@ -22097,11 +23517,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -26588,7 +26252,7 @@
fi
-@@ -22109,8 +23518,8 @@
+@@ -22109,8 +23529,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -26599,7 +26263,7 @@
XGETTEXT=":"
fi
fi
-@@ -22120,8 +23529,7 @@
+@@ -22120,8 +23540,7 @@
@@ -26609,7 +26273,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22133,8 +23541,8 @@
+@@ -22133,8 +23552,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -26620,7 +26284,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22162,24 +23570,36 @@
+@@ -22162,24 +23581,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26665,15 +26329,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22188,15 +23608,16 @@
+@@ -22188,15 +23619,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_stl_works=no
+ kde_cv_stl_works=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -26685,7 +26350,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22225,15 +23646,14 @@
+@@ -22225,15 +23657,14 @@
@@ -26704,7 +26369,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22245,9 +23665,6 @@
+@@ -22245,9 +23676,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26714,7 +26379,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22273,24 +23690,36 @@
+@@ -22273,24 +23701,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26759,18 +26424,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22299,8 +23728,9 @@
+@@ -22299,9 +23739,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcat=no
+ kde_cv_func_strlcat=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22314,11 +23744,11 @@
+ ac_ext=c
+@@ -22314,11 +23755,11 @@
fi
@@ -26786,7 +26453,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22339,8 +23769,7 @@
+@@ -22339,8 +23780,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26796,7 +26463,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22378,24 +23807,36 @@
+@@ -22378,24 +23818,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26841,7 +26508,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22405,9 +23846,10 @@
+@@ -22405,10 +23857,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26849,11 +26516,13 @@
+ kde_cv_proto_strlcat="strlcat unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22421,8 +23863,8 @@
+ ac_ext=c
+@@ -22421,8 +23874,8 @@
fi
@@ -26864,7 +26533,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22446,15 +23888,14 @@
+@@ -22446,15 +23899,14 @@
@@ -26883,7 +26552,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22466,9 +23907,6 @@
+@@ -22466,9 +23918,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26893,7 +26562,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22493,24 +23931,36 @@
+@@ -22493,24 +23942,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26938,18 +26607,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22519,8 +23969,9 @@
+@@ -22519,9 +23980,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcpy=no
+ kde_cv_func_strlcpy=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22534,11 +23985,11 @@
+ ac_ext=c
+@@ -22534,11 +23996,11 @@
fi
@@ -26965,7 +26636,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22559,8 +24010,7 @@
+@@ -22559,8 +24021,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26975,7 +26646,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22597,24 +24047,36 @@
+@@ -22597,24 +24058,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27020,7 +26691,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22624,9 +24086,10 @@
+@@ -22624,10 +24097,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27028,11 +26699,13 @@
+ kde_cv_proto_strlcpy="strlcpy unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22640,8 +24103,8 @@
+ ac_ext=c
+@@ -22640,8 +24114,8 @@
fi
@@ -27043,7 +26716,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22664,8 +24127,8 @@
+@@ -22664,8 +24138,8 @@
@@ -27054,7 +26727,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22682,30 +24145,42 @@
+@@ -22682,30 +24156,42 @@
int
main ()
{
@@ -27106,15 +26779,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22714,20 +24189,21 @@
+@@ -22714,20 +24200,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_util_main=no
+ ac_cv_lib_util_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27133,7 +26807,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22744,30 +24220,42 @@
+@@ -22744,30 +24231,42 @@
int
main ()
{
@@ -27185,15 +26859,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22776,21 +24264,22 @@
+@@ -22776,21 +24275,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
+ ac_cv_lib_compat_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27213,7 +26888,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22803,40 +24292,52 @@
+@@ -22803,40 +24303,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27278,15 +26953,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22845,19 +24346,20 @@
+@@ -22845,19 +24357,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
+ ac_cv_lib_crypt_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27304,7 +26980,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22870,40 +24372,52 @@
+@@ -22870,40 +24383,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27369,15 +27045,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22912,14 +24426,15 @@
+@@ -22912,14 +24437,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_crypt=no
+ ac_cv_lib_c_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27388,7 +27065,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22945,13 +24460,13 @@
+@@ -22945,13 +24471,13 @@
fi
@@ -27405,7 +27082,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22980,24 +24495,36 @@
+@@ -22980,24 +24506,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27450,17 +27127,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23009,7 +24536,9 @@
+@@ -23009,8 +24547,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23020,17 +24549,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23020,17 +24560,17 @@
fi
@@ -27483,7 +27162,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23059,24 +24588,36 @@
+@@ -23059,24 +24599,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27528,17 +27207,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23088,7 +24629,9 @@
+@@ -23088,8 +24640,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -23100,8 +24643,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23100,8 +24654,8 @@
fi
@@ -27549,7 +27230,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23114,8 +24657,8 @@
+@@ -23114,8 +24668,8 @@
_ACEOF
@@ -27560,7 +27241,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23128,40 +24671,52 @@
+@@ -23128,40 +24682,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27625,15 +27306,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23170,21 +24725,22 @@
+@@ -23170,21 +24736,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27653,7 +27335,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23197,40 +24753,52 @@
+@@ -23197,40 +24764,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27718,15 +27400,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23239,21 +24807,22 @@
+@@ -23239,21 +24818,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27746,7 +27429,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23280,53 +24849,59 @@
+@@ -23280,53 +24860,59 @@
#undef inet_ntoa
@@ -27825,15 +27508,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23335,17 +24910,18 @@
+@@ -23335,17 +24921,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_inet_ntoa=no
+ ac_cv_func_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -27849,7 +27533,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23358,40 +24934,52 @@
+@@ -23358,40 +24945,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27914,15 +27598,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23400,21 +24988,22 @@
+@@ -23400,21 +24999,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_inet_ntoa=no
+ ac_cv_lib_nsl_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27942,7 +27627,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23441,53 +25030,59 @@
+@@ -23441,53 +25041,59 @@
#undef connect
@@ -28021,15 +27706,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23496,17 +25091,18 @@
+@@ -23496,17 +25102,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
+ ac_cv_func_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -28045,7 +27731,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23519,40 +25115,52 @@
+@@ -23519,40 +25126,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28110,15 +27796,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23561,22 +25169,23 @@
+@@ -23561,22 +25180,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28139,7 +27826,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23603,53 +25212,59 @@
+@@ -23603,53 +25223,59 @@
#undef remove
@@ -28218,15 +27905,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23658,17 +25273,18 @@
+@@ -23658,17 +25284,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
+ ac_cv_func_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -28242,7 +27930,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23681,40 +25297,52 @@
+@@ -23681,40 +25308,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28307,15 +27995,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23723,14 +25351,15 @@
+@@ -23723,14 +25362,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28326,7 +28015,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23738,8 +25367,8 @@
+@@ -23738,8 +25378,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28337,7 +28026,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23766,53 +25395,59 @@
+@@ -23766,53 +25406,59 @@
#undef shmat
@@ -28416,15 +28105,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23821,18 +25456,19 @@
+@@ -23821,18 +25467,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
+ ac_cv_func_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -28441,7 +28131,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23845,40 +25481,52 @@
+@@ -23845,40 +25492,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28506,15 +28196,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23887,14 +25535,15 @@
+@@ -23887,14 +25546,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28525,7 +28216,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23908,18 +25557,19 @@
+@@ -23908,18 +25568,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28553,7 +28244,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23930,24 +25580,36 @@
+@@ -23930,24 +25591,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28598,17 +28289,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23956,15 +25618,16 @@
+@@ -23956,15 +25629,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28620,7 +28312,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23973,8 +25636,13 @@
+@@ -23973,8 +25647,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28636,7 +28328,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23998,9 +25666,10 @@
+@@ -23998,9 +25677,10 @@
ac_header_preproc=no
fi
@@ -28649,7 +28341,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24024,25 +25693,19 @@
+@@ -24024,25 +25704,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;}
@@ -28682,7 +28374,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24060,18 +25723,19 @@
+@@ -24060,18 +25734,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28710,7 +28402,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24082,24 +25746,36 @@
+@@ -24082,24 +25757,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28755,17 +28447,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24108,15 +25784,16 @@
+@@ -24108,15 +25795,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -28777,7 +28470,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24125,8 +25802,13 @@
+@@ -24125,8 +25813,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28793,7 +28486,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24150,9 +25832,10 @@
+@@ -24150,9 +25843,10 @@
ac_header_preproc=no
fi
@@ -28806,7 +28499,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24176,25 +25859,19 @@
+@@ -24176,25 +25870,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;}
@@ -28839,7 +28532,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24208,8 +25885,8 @@
+@@ -24208,8 +25896,8 @@
# darwin requires a poll emulation library
@@ -28850,7 +28543,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24222,40 +25899,52 @@
+@@ -24222,40 +25910,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28915,15 +28608,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24264,14 +25953,15 @@
+@@ -24264,14 +25964,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_poll_poll=no
+ ac_cv_lib_poll_poll=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28934,7 +28628,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24282,18 +25972,19 @@
+@@ -24282,18 +25983,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28962,7 +28656,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24304,24 +25995,36 @@
+@@ -24304,24 +26006,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29007,17 +28701,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24330,15 +26033,16 @@
+@@ -24330,15 +26044,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -29029,7 +28724,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24347,8 +26051,13 @@
+@@ -24347,8 +26062,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29045,7 +28740,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24372,9 +26081,10 @@
+@@ -24372,9 +26092,10 @@
ac_header_preproc=no
fi
@@ -29058,7 +28753,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24398,25 +26108,19 @@
+@@ -24398,25 +26119,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;}
@@ -29091,7 +28786,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24431,17 +26135,17 @@
+@@ -24431,17 +26146,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -29115,7 +28810,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24452,24 +26156,36 @@
+@@ -24452,24 +26167,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -29160,17 +28855,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24478,15 +26194,16 @@
+@@ -24478,15 +26205,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -29182,7 +28878,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24495,8 +26212,13 @@
+@@ -24495,8 +26223,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -29198,7 +28894,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24520,9 +26242,10 @@
+@@ -24520,9 +26253,10 @@
ac_header_preproc=no
fi
@@ -29211,7 +28907,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24546,25 +26269,18 @@
+@@ -24546,25 +26280,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;}
@@ -29242,7 +28938,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24581,8 +26297,8 @@
+@@ -24581,8 +26308,8 @@
@@ -29253,7 +28949,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24608,31 +26324,43 @@
+@@ -24608,31 +26335,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29307,7 +29003,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24643,25 +26371,25 @@
+@@ -24643,25 +26382,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29317,8 +29013,9 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -29339,7 +29036,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24673,9 +26401,6 @@
+@@ -24673,9 +26412,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29349,7 +29046,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24701,24 +26426,36 @@
+@@ -24701,24 +26437,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29394,18 +29091,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24727,8 +26464,9 @@
+@@ -24727,9 +26475,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_res_init=no
+ kde_cv_func_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -24742,11 +26480,11 @@
+ ac_ext=c
+@@ -24742,11 +26491,11 @@
fi
@@ -29421,7 +29120,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24767,8 +26505,7 @@
+@@ -24767,8 +26516,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -29431,7 +29130,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24806,24 +26543,36 @@
+@@ -24806,24 +26554,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29476,7 +29175,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24833,9 +26582,10 @@
+@@ -24833,10 +26593,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29484,11 +29183,13 @@
+ kde_cv_proto_res_init="res_init unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -24849,8 +26599,8 @@
+ ac_ext=c
+@@ -24849,8 +26610,8 @@
fi
@@ -29499,7 +29200,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24877,8 +26627,8 @@
+@@ -24877,8 +26638,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -29510,7 +29211,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24891,40 +26641,52 @@
+@@ -24891,40 +26652,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29575,15 +29276,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24933,27 +26695,28 @@
+@@ -24933,27 +26706,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ucb_killpg=no
+ ac_cv_lib_ucb_killpg=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29613,7 +29315,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24966,40 +26729,52 @@
+@@ -24966,40 +26740,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29678,15 +29380,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25008,22 +26783,23 @@
+@@ -25008,22 +26794,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29707,7 +29410,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25034,36 +26810,49 @@
+@@ -25034,36 +26821,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29767,15 +29470,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25072,20 +26861,21 @@
+@@ -25072,20 +26872,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
+ ac_cv_type_int=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -29795,7 +29499,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25098,10 +26888,11 @@
+@@ -25098,10 +26899,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29808,7 +29512,7 @@
test_array [0] = 0
;
-@@ -25109,24 +26900,36 @@
+@@ -25109,24 +26911,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29853,7 +29557,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25139,10 +26942,11 @@
+@@ -25139,10 +26953,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29866,7 +29570,7 @@
test_array [0] = 0
;
-@@ -25150,24 +26954,36 @@
+@@ -25150,24 +26965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29911,7 +29615,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25176,30 +26992,32 @@
+@@ -25176,30 +27003,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29928,8 +29632,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -29952,7 +29657,7 @@
test_array [0] = 0
;
-@@ -25207,24 +27025,36 @@
+@@ -25207,24 +27036,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29997,7 +29702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25237,10 +27067,11 @@
+@@ -25237,10 +27078,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30010,7 +29715,7 @@
test_array [0] = 0
;
-@@ -25248,24 +27079,36 @@
+@@ -25248,24 +27090,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30055,7 +29760,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25274,23 +27117,26 @@
+@@ -25274,24 +27128,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30072,8 +29777,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30082,14 +29788,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25302,10 +27148,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25302,10 +27159,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30102,7 +29811,7 @@
test_array [0] = 0
;
-@@ -25313,24 +27160,36 @@
+@@ -25313,24 +27171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30147,15 +29856,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25339,26 +27198,20 @@
+@@ -25339,26 +27209,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -30179,7 +29889,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25366,8 +27219,9 @@
+@@ -25366,8 +27230,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30191,7 +29901,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25376,35 +27230,44 @@
+@@ -25376,35 +27241,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30249,7 +29959,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25415,28 +27278,27 @@
+@@ -25415,28 +27289,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30286,7 +29996,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25447,36 +27309,49 @@
+@@ -25447,36 +27320,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30346,15 +30056,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25485,20 +27360,21 @@
+@@ -25485,20 +27371,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
+ ac_cv_type_short=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -30374,7 +30085,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25511,10 +27387,11 @@
+@@ -25511,10 +27398,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30387,7 +30098,7 @@
test_array [0] = 0
;
-@@ -25522,24 +27399,36 @@
+@@ -25522,24 +27410,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30432,7 +30143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25552,10 +27441,11 @@
+@@ -25552,10 +27452,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30445,7 +30156,7 @@
test_array [0] = 0
;
-@@ -25563,24 +27453,36 @@
+@@ -25563,24 +27464,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30490,7 +30201,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25589,30 +27491,32 @@
+@@ -25589,30 +27502,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30507,8 +30218,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30531,7 +30243,7 @@
test_array [0] = 0
;
-@@ -25620,24 +27524,36 @@
+@@ -25620,24 +27535,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30576,7 +30288,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25650,10 +27566,11 @@
+@@ -25650,10 +27577,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30589,7 +30301,7 @@
test_array [0] = 0
;
-@@ -25661,24 +27578,36 @@
+@@ -25661,24 +27589,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30634,7 +30346,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25687,23 +27616,26 @@
+@@ -25687,24 +27627,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30651,8 +30363,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30661,14 +30374,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25715,10 +27647,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25715,10 +27658,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30681,7 +30397,7 @@
test_array [0] = 0
;
-@@ -25726,24 +27659,36 @@
+@@ -25726,24 +27670,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30726,15 +30442,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25752,26 +27697,20 @@
+@@ -25752,26 +27708,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -30758,7 +30475,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25779,8 +27718,9 @@
+@@ -25779,8 +27729,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30770,7 +30487,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25789,35 +27729,44 @@
+@@ -25789,35 +27740,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30828,7 +30545,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25828,28 +27777,27 @@
+@@ -25828,28 +27788,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30865,7 +30582,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25860,36 +27808,49 @@
+@@ -25860,36 +27819,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30925,15 +30642,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25898,20 +27859,21 @@
+@@ -25898,20 +27870,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -30953,7 +30671,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25924,10 +27886,11 @@
+@@ -25924,10 +27897,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30966,7 +30684,7 @@
test_array [0] = 0
;
-@@ -25935,24 +27898,36 @@
+@@ -25935,24 +27909,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31011,7 +30729,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25965,10 +27940,11 @@
+@@ -25965,10 +27951,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31024,7 +30742,7 @@
test_array [0] = 0
;
-@@ -25976,24 +27952,36 @@
+@@ -25976,24 +27963,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31069,7 +30787,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26002,30 +27990,32 @@
+@@ -26002,30 +28001,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31086,8 +30804,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31110,7 +30829,7 @@
test_array [0] = 0
;
-@@ -26033,24 +28023,36 @@
+@@ -26033,24 +28034,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31155,7 +30874,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26063,10 +28065,11 @@
+@@ -26063,10 +28076,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31168,7 +30887,7 @@
test_array [0] = 0
;
-@@ -26074,24 +28077,36 @@
+@@ -26074,24 +28088,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31213,7 +30932,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26100,23 +28115,26 @@
+@@ -26100,24 +28126,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31230,8 +30949,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31240,14 +30960,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26128,10 +28146,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26128,10 +28157,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31260,7 +30983,7 @@
test_array [0] = 0
;
-@@ -26139,24 +28158,36 @@
+@@ -26139,24 +28169,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31305,15 +31028,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26165,26 +28196,20 @@
+@@ -26165,26 +28207,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -31337,7 +31061,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26192,8 +28217,9 @@
+@@ -26192,8 +28228,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31349,7 +31073,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26202,35 +28228,44 @@
+@@ -26202,35 +28239,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31407,7 +31131,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26241,28 +28276,27 @@
+@@ -26241,28 +28287,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31444,7 +31168,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26273,36 +28307,49 @@
+@@ -26273,36 +28318,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31504,15 +31228,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26311,20 +28358,21 @@
+@@ -26311,20 +28369,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_char_p=no
+ ac_cv_type_char_p=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -31532,7 +31257,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26337,10 +28385,11 @@
+@@ -26337,10 +28396,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31545,7 +31270,7 @@
test_array [0] = 0
;
-@@ -26348,24 +28397,36 @@
+@@ -26348,24 +28408,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31590,7 +31315,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26378,10 +28439,11 @@
+@@ -26378,10 +28450,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31603,7 +31328,7 @@
test_array [0] = 0
;
-@@ -26389,24 +28451,36 @@
+@@ -26389,24 +28462,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31648,7 +31373,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26415,30 +28489,32 @@
+@@ -26415,30 +28500,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31665,8 +31390,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31689,7 +31415,7 @@
test_array [0] = 0
;
-@@ -26446,24 +28522,36 @@
+@@ -26446,24 +28533,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31734,7 +31460,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26476,10 +28564,11 @@
+@@ -26476,10 +28575,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31747,7 +31473,7 @@
test_array [0] = 0
;
-@@ -26487,24 +28576,36 @@
+@@ -26487,24 +28587,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31792,7 +31518,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26513,23 +28614,26 @@
+@@ -26513,24 +28625,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31809,8 +31535,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31819,14 +31546,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26541,10 +28645,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26541,10 +28656,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31839,7 +31569,7 @@
test_array [0] = 0
;
-@@ -26552,24 +28657,36 @@
+@@ -26552,24 +28668,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31884,15 +31614,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26578,26 +28695,20 @@
+@@ -26578,26 +28706,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -31916,7 +31647,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26605,8 +28716,9 @@
+@@ -26605,8 +28727,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31928,7 +31659,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26615,35 +28727,44 @@
+@@ -26615,35 +28738,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31986,7 +31717,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26654,30 +28775,29 @@
+@@ -26654,30 +28786,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32025,7 +31756,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26690,40 +28810,52 @@
+@@ -26690,40 +28821,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32090,15 +31821,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26732,14 +28864,15 @@
+@@ -26732,14 +28875,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32109,7 +31841,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26748,8 +28881,8 @@
+@@ -26748,8 +28892,8 @@
fi
@@ -32120,7 +31852,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26762,40 +28895,52 @@
+@@ -26762,40 +28906,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32185,15 +31917,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26804,14 +28949,15 @@
+@@ -26804,14 +28960,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_unload=no
+ ac_cv_lib_dld_shl_unload=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32204,7 +31937,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26825,8 +28971,8 @@
+@@ -26825,8 +28982,8 @@
@@ -32215,7 +31948,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26837,36 +28983,49 @@
+@@ -26837,36 +28994,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32275,15 +32008,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26875,20 +29034,21 @@
+@@ -26875,20 +29045,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ ac_cv_type_size_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -32303,7 +32037,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26901,10 +29061,11 @@
+@@ -26901,10 +29072,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32316,7 +32050,7 @@
test_array [0] = 0
;
-@@ -26912,24 +29073,36 @@
+@@ -26912,24 +29084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32361,7 +32095,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26942,10 +29115,11 @@
+@@ -26942,10 +29126,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32374,7 +32108,7 @@
test_array [0] = 0
;
-@@ -26953,24 +29127,36 @@
+@@ -26953,24 +29138,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32419,7 +32153,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26979,30 +29165,32 @@
+@@ -26979,30 +29176,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32436,8 +32170,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32460,7 +32195,7 @@
test_array [0] = 0
;
-@@ -27010,24 +29198,36 @@
+@@ -27010,24 +29209,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32505,7 +32240,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27040,10 +29240,11 @@
+@@ -27040,10 +29251,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32518,7 +32253,7 @@
test_array [0] = 0
;
-@@ -27051,24 +29252,36 @@
+@@ -27051,24 +29263,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32563,7 +32298,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27077,23 +29290,26 @@
+@@ -27077,24 +29301,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32580,8 +32315,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32590,14 +32326,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27105,10 +29321,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27105,10 +29332,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32610,7 +32349,7 @@
test_array [0] = 0
;
-@@ -27116,24 +29333,36 @@
+@@ -27116,24 +29344,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32655,15 +32394,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27142,26 +29371,20 @@
+@@ -27142,26 +29382,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -32687,7 +32427,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27169,8 +29392,9 @@
+@@ -27169,8 +29403,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32699,7 +32439,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27179,35 +29403,44 @@
+@@ -27179,35 +29414,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32757,7 +32497,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27218,29 +29451,28 @@
+@@ -27218,29 +29462,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32795,7 +32535,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27251,36 +29483,49 @@
+@@ -27251,36 +29494,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32855,15 +32595,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27289,20 +29534,21 @@
+@@ -27289,20 +29545,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
+ ac_cv_type_unsigned_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
@@ -32883,7 +32624,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -27315,10 +29561,11 @@
+@@ -27315,10 +29572,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32896,7 +32637,7 @@
test_array [0] = 0
;
-@@ -27326,24 +29573,36 @@
+@@ -27326,24 +29584,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32941,7 +32682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27356,10 +29615,11 @@
+@@ -27356,10 +29626,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32954,7 +32695,7 @@
test_array [0] = 0
;
-@@ -27367,24 +29627,36 @@
+@@ -27367,24 +29638,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32999,7 +32740,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27393,30 +29665,32 @@
+@@ -27393,30 +29676,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33016,8 +32757,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -33040,7 +32782,7 @@
test_array [0] = 0
;
-@@ -27424,24 +29698,36 @@
+@@ -27424,24 +29709,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33085,7 +32827,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27454,10 +29740,11 @@
+@@ -27454,10 +29751,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33098,7 +32840,7 @@
test_array [0] = 0
;
-@@ -27465,24 +29752,36 @@
+@@ -27465,24 +29763,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33143,7 +32885,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27491,23 +29790,26 @@
+@@ -27491,24 +29801,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33160,8 +32902,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -33170,14 +32913,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27519,10 +29821,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27519,10 +29832,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33190,7 +32936,7 @@
test_array [0] = 0
;
-@@ -27530,24 +29833,36 @@
+@@ -27530,24 +29844,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33235,15 +32981,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27556,26 +29871,20 @@
+@@ -27556,26 +29882,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
@@ -33267,7 +33014,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27583,8 +29892,9 @@
+@@ -27583,8 +29903,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33279,7 +33026,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27593,35 +29903,44 @@
+@@ -27593,35 +29914,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33337,7 +33084,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27632,30 +29951,29 @@
+@@ -27632,30 +29962,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -33376,7 +33123,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27676,36 +29994,48 @@
+@@ -27676,36 +30005,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33437,12 +33184,13 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27717,18 +30047,18 @@
+@@ -27717,18 +30058,18 @@
{ (exit 1); exit 1; }; }
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for PIE support" >&5
@@ -33460,7 +33208,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27758,24 +30088,36 @@
+@@ -27758,24 +30099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33505,18 +33253,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27784,8 +30126,9 @@
+@@ -27784,9 +30137,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_pie_support=no
+ kde_cv_val_pie_support=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -27799,26 +30142,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27799,26 +30153,26 @@
fi
@@ -33553,7 +33303,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27837,18 +30180,19 @@
+@@ -27837,18 +30191,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33581,7 +33331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27859,24 +30203,36 @@
+@@ -27859,24 +30214,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -33626,17 +33376,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27885,15 +30241,16 @@
+@@ -27885,15 +30252,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -33648,7 +33399,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27902,8 +30259,13 @@
+@@ -27902,8 +30270,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33664,7 +33415,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27927,9 +30289,10 @@
+@@ -27927,9 +30300,10 @@
ac_header_preproc=no
fi
@@ -33677,7 +33428,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27953,25 +30316,19 @@
+@@ -27953,25 +30327,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;}
@@ -33710,7 +33461,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27983,8 +30340,8 @@
+@@ -27983,8 +30351,8 @@
done
@@ -33721,7 +33472,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28011,53 +30368,59 @@
+@@ -28011,53 +30379,59 @@
#undef _NSGetEnviron
@@ -33800,15 +33551,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28066,13 +30429,14 @@
+@@ -28066,13 +30440,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__NSGetEnviron=no
+ ac_cv_func__NSGetEnviron=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -33818,7 +33570,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28093,9 +30457,9 @@
+@@ -28093,9 +30468,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33831,7 +33583,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28121,53 +30485,59 @@
+@@ -28121,53 +30496,59 @@
#undef $ac_func
@@ -33910,15 +33662,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28176,13 +30546,15 @@
+@@ -28176,13 +30557,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -33929,7 +33682,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28199,32 +30571,32 @@
+@@ -28199,32 +30582,32 @@
@@ -33974,7 +33727,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28240,8 +30612,8 @@
+@@ -28240,8 +30623,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33985,7 +33738,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28278,8 +30650,13 @@
+@@ -28278,8 +30661,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -34001,7 +33754,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28346,6 +30723,7 @@
+@@ -28346,6 +30734,7 @@
fi
done
fi
@@ -34009,7 +33762,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28375,24 +30753,36 @@
+@@ -28375,24 +30764,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34054,7 +33807,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28403,7 +30793,7 @@
+@@ -28403,7 +30804,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34063,15 +33816,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28451,6 +30841,7 @@
+@@ -28451,7 +30852,8 @@
done
done
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28461,21 +30852,26 @@
+
+@@ -28461,21 +30863,26 @@
*-*-solaris*)
;;
*)
@@ -34106,7 +33861,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28483,7 +30879,7 @@
+@@ -28483,7 +30890,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
@@ -34115,7 +33870,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28492,7 +30888,7 @@
+@@ -28492,7 +30899,7 @@
esac
fi
cd ..
@@ -34124,7 +33879,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28536,12 +30932,12 @@
+@@ -28536,12 +30943,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -34141,7 +33896,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28569,8 +30965,8 @@
+@@ -28569,8 +30976,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.
@@ -34152,7 +33907,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28583,40 +30979,52 @@
+@@ -28583,40 +30990,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34217,15 +33972,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28625,14 +31033,15 @@
+@@ -28625,14 +31044,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34236,7 +33992,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28641,8 +31050,8 @@
+@@ -28641,8 +31061,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -34247,7 +34003,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28676,24 +31085,36 @@
+@@ -28676,24 +31096,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34292,7 +34048,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28702,9 +31123,10 @@
+@@ -28702,10 +31134,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34300,11 +34056,13 @@
+ kde_cv_have_libXext=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -28714,8 +31136,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28714,8 +31147,8 @@
fi
@@ -34315,7 +34073,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28861,8 +31283,8 @@
+@@ -28861,8 +31294,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34326,7 +34084,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28873,9 +31295,9 @@
+@@ -28873,9 +31306,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34339,7 +34097,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28887,40 +31309,52 @@
+@@ -28887,40 +31320,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34404,15 +34162,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28929,14 +31363,16 @@
+@@ -28929,14 +31374,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ eval "$as_ac_Lib=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34424,7 +34183,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28949,8 +31385,8 @@
+@@ -28949,8 +31396,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -34435,7 +34194,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28963,40 +31399,52 @@
+@@ -28963,40 +31410,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34500,15 +34259,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29005,14 +31453,15 @@
+@@ -29005,14 +31464,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34519,7 +34279,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29020,8 +31469,8 @@
+@@ -29020,8 +31480,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -34530,7 +34290,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29040,39 +31489,52 @@
+@@ -29040,40 +31500,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34591,11 +34351,13 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29088,16 +31550,15 @@
+ fi
+@@ -29088,16 +31561,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -34616,7 +34378,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29124,24 +31585,36 @@
+@@ -29124,24 +31596,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34661,17 +34423,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29150,7 +31623,9 @@
+@@ -29150,8 +31634,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29164,13 +31639,13 @@
+ ac_ext=c
+@@ -29164,13 +31650,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34689,7 +34453,7 @@
:
fi
-@@ -29182,16 +31657,15 @@
+@@ -29182,16 +31668,15 @@
case $host_os in
solaris*)
@@ -34710,7 +34474,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29218,24 +31692,36 @@
+@@ -29218,24 +31703,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34755,17 +34519,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29244,7 +31730,9 @@
+@@ -29244,8 +31741,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29258,13 +31746,13 @@
+ ac_ext=c
+@@ -29258,13 +31757,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34783,7 +34549,7 @@
:
fi
-@@ -29291,17 +31779,17 @@
+@@ -29291,17 +31790,17 @@
@@ -34807,7 +34573,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29319,21 +31807,21 @@
+@@ -29319,21 +31818,21 @@
fi
@@ -34837,7 +34603,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29352,14 +31840,14 @@
+@@ -29352,14 +31851,14 @@
@@ -34856,7 +34622,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29393,24 +31881,36 @@
+@@ -29393,24 +31892,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34901,18 +34667,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29419,8 +31919,9 @@
+@@ -29419,9 +31930,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_z=no"
+ eval "ac_cv_lib_z=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29434,8 +31935,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29434,8 +31946,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34923,7 +34691,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29455,8 +31956,8 @@
+@@ -29455,8 +31967,8 @@
@@ -34934,7 +34702,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29492,24 +31993,36 @@
+@@ -29492,24 +32004,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34979,7 +34747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29518,9 +32031,10 @@
+@@ -29518,10 +32042,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34987,11 +34755,13 @@
+ eval "ac_cv_lib_png=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29535,19 +32049,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29535,19 +32060,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -35017,7 +34787,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29580,24 +32094,36 @@
+@@ -29580,24 +32105,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35062,18 +34832,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29606,8 +32132,9 @@
+@@ -29606,9 +32143,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_6b=no"
+ eval "ac_cv_lib_jpeg_6b=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29618,14 +32145,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29618,14 +32156,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -35094,7 +34866,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29658,24 +32185,36 @@
+@@ -29658,24 +32196,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35139,18 +34911,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29684,8 +32223,9 @@
+@@ -29684,9 +32234,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_normal=no"
+ eval "ac_cv_lib_jpeg_normal=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29696,11 +32236,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29696,11 +32247,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -35166,16 +34940,16 @@
LIBJPEG=
-@@ -29720,7 +32260,7 @@
+@@ -29720,7 +32271,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29723: $i/$j" >&5
-+ echo "configure: 32263: $i/$j" >&5
++ echo "configure: 32274: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29767,14 +32307,14 @@
+@@ -29767,14 +32318,14 @@
@@ -35193,7 +34967,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29817,8 +32357,8 @@
+@@ -29817,8 +32368,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35204,7 +34978,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29827,8 +32367,8 @@
+@@ -29827,8 +32378,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35215,7 +34989,7 @@
PERL=$kde_cv_path
fi
-@@ -29842,10 +32382,9 @@
+@@ -29842,10 +32393,9 @@
@@ -35228,7 +35002,7 @@
else
if test $kde_qtver = 3; then
-@@ -29855,7 +32394,8 @@
+@@ -29855,7 +32405,8 @@
fi
@@ -35238,7 +35012,7 @@
USING_QT_MT=""
-@@ -29875,13 +32415,13 @@
+@@ -29875,13 +32426,13 @@
else
kde_check_threading_default=yes
fi
@@ -35256,7 +35030,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29953,8 +32493,8 @@
+@@ -29953,8 +32504,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -35267,7 +35041,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29963,34 +32503,34 @@
+@@ -29963,34 +32514,34 @@
qt_libraries=""
qt_includes=""
@@ -35282,14 +35056,14 @@
-fi;
+fi
-+
-# Check whether --with-qt-includes or --without-qt-includes was given.
+-if test "${with_qt_includes+set}" = set; then
+- withval="$with_qt_includes"
+
+# Check whether --with-qt-includes was given.
- if test "${with_qt_includes+set}" = set; then
-- withval="$with_qt_includes"
--
++if test "${with_qt_includes+set}" = set; then
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -35314,16 +35088,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30018,7 +32558,7 @@
+@@ -30018,7 +32569,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30021: $i/$j" >&5
-+ echo "configure: 32561: $i/$j" >&5
++ echo "configure: 32572: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30055,8 +32595,7 @@
+@@ -30055,8 +32606,7 @@
ac_qt_libraries="$qt_libdir"
@@ -35333,7 +35107,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30193,13 +32732,13 @@
+@@ -30193,13 +32743,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -35351,7 +35125,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30208,15 +32747,14 @@
+@@ -30208,15 +32758,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -35370,7 +35144,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30337,12 +32875,12 @@
+@@ -30337,12 +32886,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -35387,7 +35161,7 @@
fi
-@@ -30380,14 +32918,14 @@
+@@ -30380,14 +32929,14 @@
fi
@@ -35405,7 +35179,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30430,8 +32968,8 @@
+@@ -30430,8 +32979,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35416,7 +35190,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30452,22 +32990,22 @@
+@@ -30452,22 +33001,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35444,7 +35218,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30510,12 +33048,12 @@
+@@ -30510,12 +33059,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35461,7 +35235,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30545,10 +33083,10 @@
+@@ -30545,10 +33094,10 @@
if test $kde_qtver = 3; then
@@ -35475,7 +35249,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30571,22 +33109,22 @@
+@@ -30571,22 +33120,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35505,7 +35279,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30609,13 +33147,13 @@
+@@ -30609,13 +33158,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35523,7 +35297,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30646,15 +33184,14 @@
+@@ -30646,15 +33195,14 @@
if test -n "$LIBJPEG"; then
@@ -35542,7 +35316,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30687,24 +33224,36 @@
+@@ -30687,24 +33235,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35587,18 +35361,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30713,8 +33262,9 @@
+@@ -30713,9 +33273,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "kde_cv_qt_jpeg=yes"
+ eval "kde_cv_qt_jpeg=yes"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -30731,12 +33281,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30731,12 +33292,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35615,7 +35391,7 @@
LIBJPEG_QT=
fi
-@@ -30767,15 +33317,15 @@
+@@ -30767,15 +33328,15 @@
@@ -35637,7 +35413,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30799,11 +33349,11 @@
+@@ -30799,11 +33360,11 @@
@@ -35653,34 +35429,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30855,7 +33405,7 @@
+@@ -30855,7 +33416,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30858: $i/$j" >&5
-+ echo "configure: 33408: $i/$j" >&5
++ echo "configure: 33419: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30885,7 +33435,7 @@
+@@ -30885,7 +33446,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30888: $i/$j" >&5
-+ echo "configure: 33438: $i/$j" >&5
++ echo "configure: 33449: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30903,7 +33453,7 @@
+@@ -30903,7 +33464,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30906: $i/$j" >&5
-+ echo "configure: 33456: $i/$j" >&5
++ echo "configure: 33467: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30962,12 +33512,12 @@
+@@ -30962,12 +33523,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35697,7 +35473,7 @@
fi
kde_libraries="${libdir}"
-@@ -30976,8 +33526,8 @@
+@@ -30976,8 +33537,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35708,7 +35484,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31015,8 +33565,8 @@
+@@ -31015,8 +33576,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -35719,7 +35495,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31059,8 +33609,8 @@
+@@ -31059,8 +33620,8 @@
fi
@@ -35730,7 +35506,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31092,10 +33642,9 @@
+@@ -31092,10 +33653,9 @@
@@ -35743,7 +35519,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31109,13 +33658,14 @@
+@@ -31109,13 +33669,14 @@
fi
@@ -35761,28 +35537,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31226,15 +33776,14 @@
+@@ -31226,15 +33787,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31286,8 +33835,8 @@
+@@ -31286,8 +33846,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35793,7 +35569,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31326,8 +33875,8 @@
+@@ -31326,8 +33886,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35804,7 +35580,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31335,8 +33884,8 @@
+@@ -31335,8 +33895,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35815,28 +35591,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31529,15 +34078,14 @@
+@@ -31529,15 +34089,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31589,8 +34137,8 @@
+@@ -31589,8 +34148,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35847,7 +35623,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31629,8 +34177,8 @@
+@@ -31629,8 +34188,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35858,7 +35634,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31638,8 +34186,8 @@
+@@ -31638,8 +34197,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35869,7 +35645,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31731,22 +34279,22 @@
+@@ -31731,22 +34290,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35898,7 +35674,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31779,14 +34327,14 @@
+@@ -31779,14 +34338,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35916,7 +35692,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31829,8 +34377,8 @@
+@@ -31829,8 +34388,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35927,7 +35703,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31841,21 +34389,21 @@
+@@ -31841,21 +34400,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35954,7 +35730,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31898,8 +34446,8 @@
+@@ -31898,8 +34457,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35965,7 +35741,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31910,22 +34458,22 @@
+@@ -31910,22 +34469,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35993,7 +35769,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31968,8 +34516,8 @@
+@@ -31968,8 +34527,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36004,7 +35780,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31982,21 +34530,21 @@
+@@ -31982,21 +34541,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36031,7 +35807,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32039,8 +34587,8 @@
+@@ -32039,8 +34598,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36042,7 +35818,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32053,22 +34601,22 @@
+@@ -32053,22 +34612,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36070,7 +35846,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32111,12 +34659,12 @@
+@@ -32111,12 +34670,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36087,7 +35863,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32145,14 +34693,14 @@
+@@ -32145,14 +34704,14 @@
if test -n "$kde32ornewer"; then
@@ -36105,7 +35881,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32195,8 +34743,8 @@
+@@ -32195,8 +34754,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36116,7 +35892,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32207,21 +34755,21 @@
+@@ -32207,21 +34766,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36143,7 +35919,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32264,8 +34812,8 @@
+@@ -32264,8 +34823,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36154,7 +35930,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32276,8 +34824,8 @@
+@@ -32276,8 +34835,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36165,7 +35941,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32285,14 +34833,14 @@
+@@ -32285,14 +34844,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -36183,7 +35959,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32335,8 +34883,8 @@
+@@ -32335,8 +34894,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36194,7 +35970,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32347,8 +34895,8 @@
+@@ -32347,8 +34906,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36205,7 +35981,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32356,14 +34904,14 @@
+@@ -32356,14 +34915,14 @@
fi
@@ -36223,7 +35999,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32406,12 +34954,12 @@
+@@ -32406,12 +34965,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36240,16 +36016,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32426,7 +34974,7 @@
+@@ -32426,7 +34985,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32429: $i/$j" >&5
-+ echo "configure: 34977: $i/$j" >&5
++ echo "configure: 34988: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32587,13 +35135,12 @@
+@@ -32587,13 +35146,12 @@
@@ -36266,7 +36042,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32614,13 +35161,13 @@
+@@ -32614,13 +35172,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -36284,7 +36060,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32640,16 +35187,15 @@
+@@ -32640,16 +35198,217 @@
kde_have_gcc_visibility=no
@@ -36295,17 +36071,254 @@
kde_cache=`echo fvisibility=hidden | 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=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
++
++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 -fvisibility=hidden"
++ 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 { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_prog_cxx_$kde_cache=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext 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; }
++ :
++
++ kde_have_gcc_visibility=yes
++ # Check whether --enable-gcc-hidden-visibility was given.
++if test "${enable_gcc_hidden_visibility+set}" = set; then
++ enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
++else
++ kde_have_gcc_visibility=no
++fi
++
++
++ { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
++echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
++if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++
++ 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
++
++ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++
++
++
++ safe_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $all_includes"
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#include <qglobal.h>
++#if Q_EXPORT - 0 != 0
++/* if this compiles, then Q_EXPORT is undefined */
++/* if Q_EXPORT is nonempty, this will break compilation */
++#endif
++
++int
++main ()
++{
++/* elvis is alive */
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_val_qt_gcc_visibility_patched=no
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ kde_cv_val_qt_gcc_visibility_patched=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++ CXXFLAGS=$safe_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
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
++
++ if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++
++ { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
++if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
- ac_ext=cc
-+ ac_ext=cpp
++ 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'
-@@ -32676,24 +35222,36 @@
+@@ -32658,175 +35417,448 @@
+ 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 -fvisibility=hidden"
+- cat >conftest.$ac_ext <<_ACEOF
++
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++ LDFLAGS="$LDFLAGS -shared -fPIC"
++
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ #include <string>
++ int some_function( void ) __attribute__ ((visibility("default")));
++ int some_function( void )
++ {
++ std::string s("blafasel");
++ return 0;
++ }
++
+ int
+ main ()
+ {
+- return 0;
++/* elvis is alive */
+ ;
+ return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36350,67 +36363,256 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32702,7 +35260,9 @@
+- eval "kde_cv_prog_cxx_$kde_cache=yes"
++ kde_cv_val_gcc_visibility_bug=no
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
++ kde_cv_val_gcc_visibility_bug=yes
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
-@@ -32716,28 +35276,27 @@
+- CXXFLAGS="$save_CXXFLAGS"
+- ac_ext=c
++
++ 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_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
- 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
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- :
+- :
++ if test x$kde_cv_val_gcc_visibility_bug = xno; then
++ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++ fi
- kde_have_gcc_visibility=yes
+- kde_have_gcc_visibility=yes
- # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
-+ # Check whether --enable-gcc-hidden-visibility was given.
- if test "${enable_gcc_hidden_visibility+set}" = set; then
+-if test "${enable_gcc_hidden_visibility+set}" = set; then
- enableval="$enable_gcc_hidden_visibility"
- kde_have_gcc_visibility=$enableval
-+ enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
- else
- kde_have_gcc_visibility=no
+-else
+- kde_have_gcc_visibility=no
-fi;
-+fi
- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
+-if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ HAVE_GCC_VISIBILITY=1
+
-+ { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-+echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
- if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
++cat >>confdefs.h <<_ACEOF
++#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
++_ACEOF
++
++ fi
++
else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ :
++fi
--
++ fi
+
- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32772,24 +35331,36 @@
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_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'
++DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
++CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+
++for ac_prog in flex lex
++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_LEX+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$LEX"; then
++ ac_cv_prog_LEX="$LEX" # 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_LEX="$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
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++ { echo "$as_me:$LINENO: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
+- safe_CXXFLAGS=$CXXFLAGS
+- CXXFLAGS="$CXXFLAGS $all_includes"
+
+- cat >conftest.$ac_ext <<_ACEOF
++ test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
++if test -z "$LEXLIB"
++then
++ { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
++/* 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
++char yywrap ();
++int
++main ()
++{
++return yywrap ();
++ ;
++ return 0;
++}
++_ACEOF
++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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_fl_yywrap=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_fl_yywrap=no
++fi
++
++rm -f core 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_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
++if test $ac_cv_lib_fl_yywrap = yes; then
++ LEXLIB="-lfl"
++else
++ { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll $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 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
++char yywrap ();
+ int
+ main ()
+ {
+-/* elvis is alive */
++return yywrap ();
+ ;
+ 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
-+if { (ac_try="$ac_compile"
++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_compile") 2>conftest.er1
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -36421,7 +36623,7 @@
- || 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -36431,9 +36633,10 @@
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_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
++ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -36443,57 +36646,227 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32798,8 +35369,9 @@
+- kde_cv_val_qt_gcc_visibility_patched=no
++ ac_cv_lib_l_yywrap=yes
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_qt_gcc_visibility_patched=yes
-+ kde_cv_val_qt_gcc_visibility_patched=yes
++ ac_cv_lib_l_yywrap=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- CXXFLAGS=$safe_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 core 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_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
++if test $ac_cv_lib_l_yywrap = yes; then
++ LEXLIB="-ll"
++fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++fi
++
++if test "x$LEX" != "x:"; then
++ { echo "$as_me:$LINENO: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
++if test "${ac_cv_prog_lex_root+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # The minimal lex program is just a single line: %%. But some broken lexes
++# (Solaris, I think it was) want two %% lines, so accommodate them.
++cat >conftest.l <<_ACEOF
++%%
++%%
++_ACEOF
++{ (ac_try="$LEX conftest.l"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$LEX conftest.l") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++if test -f lex.yy.c; then
++ ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++ ac_cv_prog_lex_root=lexyy
++else
++ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
++rm -f conftest.l
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent. Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
++ac_save_LIBS=$LIBS
++LIBS="$LIBS $LEXLIB"
++cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_lex_yytext_pointer=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
- CXXFLAGS=$safe_CXXFLAGS
-@@ -32812,21 +35384,20 @@
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
++rm -f "${LEX_OUTPUT_ROOT}.c"
fi
-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-+echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++cat >>confdefs.h <<\_ACEOF
++#define YYTEXT_POINTER 1
++_ACEOF
- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
-+echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
- if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++fi
++fi
++if test "$LEX" = :; then
++ LEX=${am_missing_run}flex
++fi
--
+
- ac_ext=cc
-+ ac_ext=cpp
++ 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'
-@@ -32866,24 +35437,36 @@
- }
+@@ -32835,71 +35867,167 @@
+ 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 -fPIC -fvisibility-inlines-hidden -O0"
+- LDFLAGS="$LDFLAGS -shared -fPIC"
+-
+- cat >conftest.$ac_ext <<_ACEOF
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
++echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
+- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
+- #include <string>
+- int some_function( void ) __attribute__ ((visibility("default")));
+- int some_function( void )
+- {
+- std::string s("blafasel");
+- return 0;
+- }
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+- ;
+- return 0;
+-}
++$ac_includes_default
++#include <FlexLexer.h>
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
++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_link") 2>conftest.er1
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -36514,9 +36887,10 @@
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_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
++ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -36526,112 +36900,369 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32892,8 +35475,9 @@
+- kde_cv_val_gcc_visibility_bug=no
++ ac_header_compiler=yes
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_gcc_visibility_bug=yes
-+ kde_cv_val_gcc_visibility_bug=yes
++ ac_header_compiler=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+
+- CXXFLAGS=$safe_CXXFLAGS
+- LDFLAGS=$safe_LDFLAGS
+- ac_ext=c
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
++# Is the header present?
++{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
++echo $ECHO_N "checking FlexLexer.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 <FlexLexer.h>
++_ACEOF
++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_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: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
++
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_FlexLexer_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++
++fi
++if test $ac_cv_header_FlexLexer_h = yes; then
++ kde_have_flex=yes
++else
++ kde_have_flex=no
++fi
++
++
++
++if test "$kde_have_flex" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE kbabel"
++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'
+@@ -32907,86 +36035,157 @@
-@@ -32908,8 +35492,8 @@
++# Check whether --with-berkeley-db was given.
++if test "${with_berkeley_db+set}" = set; then
++ withval=$with_berkeley_db;
++else
++ with_berkeley_db=check
fi
-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
-+echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
- if test x$kde_cv_val_gcc_visibility_bug = xno; then
- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32925,8 +35509,8 @@
- fi
+- if test x$kde_cv_val_gcc_visibility_bug = xno; then
+- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+- fi
- else
++LIB_DBIV=""
++if test "x$with_berkeley_db" != xno; then
+
+- HAVE_GCC_VISIBILITY=1
++{ echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
++echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6; }
+
+-cat >>confdefs.h <<_ACEOF
+-#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
+-_ACEOF
++db_libraries=""
++db_includes=""
++db_name=""
++ac_db_name="db"
++ac_db_includes=""
++ac_db_libraries=""
++ac_db_include_file="db.h"
+
+- 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; }
- :
+- :
++# Check whether --with-db-dir was given.
++if test "${with_db_dir+set}" = set; then
++ withval=$with_db_dir; ac_db_includes=-I"$withval"/include
++ ac_db_libraries=-L"$withval"/lib
fi
-@@ -32941,8 +35525,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
+
+- fi
+
++# Check whether --with-db-include-dir was given.
++if test "${with_db_include_dir+set}" = set; then
++ withval=$with_db_include_dir; ac_db_includes=-I"$withval"
+
+-DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
+-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
++fi
+
+-for ac_prog in flex lex
+-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_LEX+set}" = set; then
+-if test "${ac_cv_prog_LEX+set}" = set; then
++
++# Check whether --with-db-include was given.
++if test "${with_db_include+set}" = set; then
++ withval=$with_db_include; ac_db_include_file=-I"$withval"
++
++fi
++
++
++# Check whether --with-db-lib-dir was given.
++if test "${with_db_lib_dir+set}" = set; then
++ withval=$with_db_lib_dir; ac_db_libraries=-L"$withval"
++
++fi
++
++
++# Check whether --with-db-name was given.
++if test "${with_db_name+set}" = set; then
++ withval=$with_db_name; ac_db_name="$withval"
++
++fi
++
++
++
++
++if test "${kde_cv_berk_database+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32955,33 +35539,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+- if test -n "$LEX"; then
+- ac_cv_prog_LEX="$LEX" # 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
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LEX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
+- ac_cv_prog_LEX="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; then
+-fi
+-fi
+-LEX=$ac_cv_prog_LEX
+-if test -n "$LEX"; then
- echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6
-+ { echo "$as_me:$LINENO: result: $LEX" >&5
-+echo "${ECHO_T}$LEX" >&6; }
++kde_safe_LDFLAGS=$LDFLAGS
++kde_db_safe_LIBS=$LIBS
++LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
++
++kde_cv_berk_database=NO
++if test "xNO" = "x$kde_cv_berk_database" ; then
++
++LIBS="$kde_db_safe -l$ac_db_name"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#include <$ac_db_include_file>
++
++int
++main ()
++{
++
++#if DB_VERSION_MAJOR == 4
++DB *db;
++#if DB_VERSION_MINOR > 0
++db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#else
++db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#endif
++#else
++error
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_berk_database=$ac_db_name
++
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: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
fi
-+
- test -n "$LEX" && break
- done
- test -n "$LEX" || LEX=":"
+- test -n "$LEX" && break
+-done
+-test -n "$LEX" || LEX=":"
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- if test -z "$LEXLIB"
- then
+-if test -z "$LEXLIB"
+-then
- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-+echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_fl_yywrap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -32994,40 +35580,52 @@
+-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl $LIBS"
++fi
++if test "xNO" = "x$kde_cv_berk_database" ; then
++
++LIBS="$kde_db_safe -ldb4"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32994,66 +36193,77 @@
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
+-#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 yywrap ();
+-char yywrap ();
++#include <db4/db.h>
++
int
main ()
{
-yywrap ();
-+return yywrap ();
++
++#if DB_VERSION_MAJOR == 4
++DB *db;
++#if DB_VERSION_MINOR > 0
++db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#else
++db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#endif
++#else
++error
++#endif
++
;
return 0;
}
@@ -36678,51 +37309,70 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33036,19 +35634,20 @@
+- ac_cv_lib_fl_yywrap=yes
++ kde_cv_berk_database=db4
++
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_fl_yywrap=no
-+ ac_cv_lib_fl_yywrap=no
++
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+-LIBS=$ac_check_lib_save_LIBS
++
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
- if test $ac_cv_lib_fl_yywrap = yes; then
- LEXLIB="-lfl"
- else
+-if test $ac_cv_lib_fl_yywrap = yes; then
+- LEXLIB="-lfl"
+-else
- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-+echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
- if test "${ac_cv_lib_l_yywrap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -33061,40 +35660,52 @@
+-if test "${ac_cv_lib_l_yywrap+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ll $LIBS"
++if test "xNO" = "x$kde_cv_berk_database" ; then
++
++LIBS="$kde_db_safe -ldb4"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -33061,163 +36271,261 @@
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
+-#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 yywrap ();
+-char yywrap ();
++#include <db.h>
++
int
main ()
{
-yywrap ();
-+return yywrap ();
++
++#if DB_VERSION_MAJOR == 4
++DB *db;
++#if DB_VERSION_MINOR > 0
++db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#else
++db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#endif
++#else
++error
++#endif
++
;
return 0;
}
@@ -36769,72 +37419,105 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33103,14 +35714,15 @@
+- ac_cv_lib_l_yywrap=yes
++ kde_cv_berk_database=db4-db
++
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_l_yywrap=no
-+ ac_cv_lib_l_yywrap=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-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_l_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
- if test $ac_cv_lib_l_yywrap = yes; then
- LEXLIB="-ll"
+-if test $ac_cv_lib_l_yywrap = yes; then
+- LEXLIB="-ll"
+-fi
+
fi
-@@ -33120,8 +35732,8 @@
- fi
- if test "x$LEX" != "x:"; then
+-fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+-if test "x$LEX" != "x:"; then
- echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking lex output file root" >&5
-+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
- if test "${ac_cv_prog_lex_root+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -33131,8 +35743,13 @@
- %%
- %%
- _ACEOF
+-if test "${ac_cv_prog_lex_root+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- # The minimal lex program is just a single line: %%. But some broken lexes
+-# (Solaris, I think it was) want two %% lines, so accommodate them.
+-cat >conftest.l <<_ACEOF
+-%%
+-%%
+-_ACEOF
-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
- (eval $LEX conftest.l) 2>&5
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -33146,13 +35763,13 @@
- { (exit 1); exit 1; }; }
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-if test -f lex.yy.c; then
+- ac_cv_prog_lex_root=lex.yy
+-elif test -f lexyy.c; then
+- ac_cv_prog_lex_root=lexyy
+-else
+- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+- { (exit 1); exit 1; }; }
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
- rm -f conftest.l
- LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+-rm -f conftest.l
+-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++if test "xNO" = "x$kde_cv_berk_database" ; then
-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
- if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -33167,24 +35784,36 @@
- `cat $LEX_OUTPUT_ROOT.c`
+-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- # POSIX says lex can declare yytext either as a pointer or an array; the
+-# default is implementation-dependent. Figure out which it is, since
+-# not all implementations provide the %pointer and %array declarations.
+-ac_cv_prog_lex_yytext_pointer=no
+-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+-ac_save_LIBS=$LIBS
+-LIBS="$LIBS $LEXLIB"
++LIBS="$kde_db_safe -ldb"
+ cat >conftest.$ac_ext <<_ACEOF
+-`cat $LEX_OUTPUT_ROOT.c`
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#include <db.h>
++
++int
++main ()
++{
++
++#if DB_VERSION_MAJOR == 4
++DB *db;
++#if DB_VERSION_MINOR > 0
++db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#else
++db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
++#endif
++#else
++error
++#endif
++
++ ;
++ return 0;
++}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -36878,62 +37561,181 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33193,15 +35822,17 @@
+- ac_cv_prog_lex_yytext_pointer=yes
++ kde_cv_berk_database=db
++
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
- fi
++fi
+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_save_LIBS
- rm -f "${LEX_OUTPUT_ROOT}.c"
-
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++
++fi
++
++LIBS=$kde_db_safe_LIBS
++LDFLAGS=$kde_safe_LDFLAGS
++
++
++fi
++
++
++kde_db_header=""
++DBSEARCHENGINE=dbsearchengine
++
++case "$kde_cv_berk_database" in
++ NO)
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ LIB_DBIV=""
++ DBSEARCHENGINE=""
++ ;;
++ db)
++ LIB_DBIV="-l$ac_db_name"
++ kde_db_header=db.h
++ { echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
++echo "${ECHO_T}-l$ac_db_name" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DB_DB_H 1
++_ACEOF
++
++ ;;
++ db4-db)
++ LIB_DBIV='-ldb4'
++ kde_db_header=db.h
++ { echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
++echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DB_DB_H 1
++_ACEOF
++
++ ;;
++ db4)
++ LIB_DBIV='-ldb4'
++ kde_db_header=db4/db.h
++ { echo "$as_me:$LINENO: result: -ldb4" >&5
++echo "${ECHO_T}-ldb4" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DB4_DB_H 1
++_ACEOF
++
++ ;;
++ $ac_db_name)
++ LIB_DBIV="-l$ac_db_name"
++ kde_db_header="$ac_db_include_file"
++ { echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
++echo "${ECHO_T}user specified $ac_db_name" >&6; }
++ if test "x$ac_db_include_file" = "xdb.h" ; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DB_DB_H 1
++_ACEOF
++
++ else
++
++cat >>confdefs.h <<_ACEOF
++#define USE_DB_H_PATH <$ac_db_include_file>
++_ACEOF
++
++ fi
++
++ ;;
++esac
++
++DBIV_LDFLAGS="$ac_db_libraries"
++DBIV_INCLUDES="$ac_db_includes"
++DBIV_NAME="$ac_db_name"
++
++if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
++ { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
++echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
++ { (exit 1); exit 1; }; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_save_LIBS
+-rm -f "${LEX_OUTPUT_ROOT}.c"
+-
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
- if test $ac_cv_prog_lex_yytext_pointer = yes; then
+-if test $ac_cv_prog_lex_yytext_pointer = yes; then
- cat >>confdefs.h <<\_ACEOF
-@@ -33216,8 +35847,7 @@
+-cat >>confdefs.h <<\_ACEOF
+-#define YYTEXT_POINTER 1
+-_ACEOF
+
+-fi
+
++
++
++
++
++
++
++if test -n "$DBSEARCHENGINE"; then
++ include_DBSEARCHENGINE_TRUE=
++ include_DBSEARCHENGINE_FALSE='#'
++else
++ include_DBSEARCHENGINE_TRUE='#'
++ include_DBSEARCHENGINE_FALSE=
fi
+-if test "$LEX" = :; then
+- LEX=${am_missing_run}flex
+-fi
--
+
- ac_ext=cc
-+ ac_ext=cpp
++
++HAVE_KCAL=0
++
++ kde_safe_cppflags=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS $all_includes"
++
++ 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'
-@@ -33227,17 +35857,17 @@
+@@ -33226,18 +36534,18 @@
+ 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_FlexLexer_h+set}" = set; then
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
- echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++ if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
++echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
++echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-+echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
++echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33248,24 +35878,36 @@
- #include <FlexLexer.h>
+@@ -33245,27 +36553,39 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <FlexLexer.h>
++#include <libkcal/resourcecalendar.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -36977,31 +37779,34 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33274,15 +35916,16 @@
+@@ -33274,25 +36594,31 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-+echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
++echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33291,8 +35934,13 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <FlexLexer.h>
+-#include <FlexLexer.h>
++#include <libkcal/resourcecalendar.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -37015,7 +37820,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33316,9 +35964,10 @@
+@@ -33316,1395 +36642,1286 @@
ac_header_preproc=no
fi
@@ -37028,10 +37833,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33342,25 +35991,18 @@
- echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
+ yes:no: )
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -37040,236 +37865,333 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
+
;;
esac
-echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++{ echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
++echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_FlexLexer_h=$ac_header_preproc
+- ac_cv_header_FlexLexer_h=$ac_header_preproc
++ ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
++echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
fi
- if test $ac_cv_header_FlexLexer_h = yes; then
-@@ -33382,19 +36024,19 @@
+-if test $ac_cv_header_FlexLexer_h = yes; then
+- kde_have_flex=yes
++if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
++ HAVE_KCAL=1
+ else
+- kde_have_flex=no
++ { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
++ resource for KOrganizer won't be compiled." >&5
++echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
++ resource for KOrganizer won't be compiled." >&2;}
+ fi
+-
+-if test "$kde_have_flex" = "no"; then
+- DO_NOT_COMPILE="$DO_NOT_COMPILE kbabel"
+-fi
+-ac_ext=c
++ 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 --with-berkeley-db or --without-berkeley-db was given.
-+# Check whether --with-berkeley-db was given.
- if test "${with_berkeley_db+set}" = set; then
+-if test "${with_berkeley_db+set}" = set; then
- withval="$with_berkeley_db"
-
-+ withval=$with_berkeley_db;
- else
- with_berkeley_db=check
+-else
+- with_berkeley_db=check
-fi;
-+fi
-+
-
- LIB_DBIV=""
- if test "x$with_berkeley_db" != xno; then
-
+-
+-LIB_DBIV=""
+-if test "x$with_berkeley_db" != xno; then
+-
-echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
-echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
-+echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6; }
-
- db_libraries=""
- db_includes=""
-@@ -33405,41 +36047,41 @@
- ac_db_include_file="db.h"
-
-
+-
+-db_libraries=""
+-db_includes=""
+-db_name=""
+-ac_db_name="db"
+-ac_db_includes=""
+-ac_db_libraries=""
+-ac_db_include_file="db.h"
+-
+-
-# Check whether --with-db-dir or --without-db-dir was given.
-+# Check whether --with-db-dir was given.
- if test "${with_db_dir+set}" = set; then
+-if test "${with_db_dir+set}" = set; then
- withval="$with_db_dir"
- ac_db_includes=-I"$withval"/include
-+ withval=$with_db_dir; ac_db_includes=-I"$withval"/include
- ac_db_libraries=-L"$withval"/lib
-
+- ac_db_libraries=-L"$withval"/lib
+-
-fi;
-+fi
-+
-
+-
-# Check whether --with-db-include-dir or --without-db-include-dir was given.
-+# Check whether --with-db-include-dir was given.
- if test "${with_db_include_dir+set}" = set; then
+-if test "${with_db_include_dir+set}" = set; then
- withval="$with_db_include_dir"
- ac_db_includes=-I"$withval"
-+ withval=$with_db_include_dir; ac_db_includes=-I"$withval"
-+
-+fi
-
+-
-fi;
-
+-
-# Check whether --with-db-include or --without-db-include was given.
-+# Check whether --with-db-include was given.
- if test "${with_db_include+set}" = set; then
+-if test "${with_db_include+set}" = set; then
- withval="$with_db_include"
- ac_db_include_file=-I"$withval"
-+ withval=$with_db_include; ac_db_include_file=-I"$withval"
-+
-+fi
-
+-
-fi;
-
+-
-# Check whether --with-db-lib-dir or --without-db-lib-dir was given.
-+# Check whether --with-db-lib-dir was given.
- if test "${with_db_lib_dir+set}" = set; then
+-if test "${with_db_lib_dir+set}" = set; then
- withval="$with_db_lib_dir"
- ac_db_libraries=-L"$withval"
-+ withval=$with_db_lib_dir; ac_db_libraries=-L"$withval"
-+
-+fi
-
+-
-fi;
-
+-
-# Check whether --with-db-name or --without-db-name was given.
-+# Check whether --with-db-name was given.
- if test "${with_db_name+set}" = set; then
+-if test "${with_db_name+set}" = set; then
- withval="$with_db_name"
- ac_db_name="$withval"
-+ withval=$with_db_name; ac_db_name="$withval"
-+
-+fi
-
+-
-fi;
-
-
-
-@@ -33484,24 +36126,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-
+-
+-
+-if test "${kde_cv_berk_database+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-kde_safe_LDFLAGS=$LDFLAGS
+-kde_db_safe_LIBS=$LIBS
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
+-
+-kde_cv_berk_database=NO
+-if test "xNO" = "x$kde_cv_berk_database" ; then
+-
+-LIBS="$kde_db_safe -l$ac_db_name"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <$ac_db_include_file>
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+-error
+-#endif
+-
+- ;
+- 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_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -33511,7 +36165,9 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_cv_berk_database=$ac_db_name
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-@@ -33548,24 +36204,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
++if test "$HAVE_KCAL" = 1; then
++ include_kcalresource_TRUE=
++ include_kcalresource_FALSE='#'
+ 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
+-
+-fi
+-if test "xNO" = "x$kde_cv_berk_database" ; then
+-
+-LIBS="$kde_db_safe -ldb4"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <db4/db.h>
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+-error
+-#endif
+-
+- ;
+- 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_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -33575,7 +36243,9 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_cv_berk_database=db4
++ include_kcalresource_TRUE='#'
++ include_kcalresource_FALSE=
++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_exeext conftest.$ac_ext
+
+-fi
+-if test "xNO" = "x$kde_cv_berk_database" ; then
++KCACHEGRIND_VERSION=0.4.6kde
+
+-LIBS="$kde_db_safe -ldb4"
+
- fi
+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-@@ -33612,24 +36282,36 @@
- }
++
++for ac_header in stdlib.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++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
++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
- rm -f conftest.$ac_objext conftest$ac_exeext
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
+-#include <db.h>
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+-error
+-#endif
+-
+- ;
+- return 0;
+-}
++$ac_includes_default
++#include <$ac_header>
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
++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_link") 2>conftest.er1
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -37290,9 +38212,10 @@
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_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
++ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -37302,172 +38225,347 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33639,7 +36321,9 @@
+- kde_cv_berk_database=db4-db
+-
++ 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_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-@@ -33676,24 +36360,36 @@
- }
+-fi
+-if test "xNO" = "x$kde_cv_berk_database" ; then
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+-LIBS="$kde_db_safe -ldb"
++# 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
- rm -f conftest.$ac_objext conftest$ac_exeext
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
+-#include <db.h>
+-
+-int
+-main ()
+-{
+-
+-#if DB_VERSION_MAJOR == 4
+-DB *db;
+-#if DB_VERSION_MINOR > 0
+-db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#else
+-db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+-#endif
+-#else
+-error
+-#endif
+-
+- ;
+- return 0;
+-}
++#include <$ac_header>
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
++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_link") 2>conftest.er1
++ (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); } &&
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -33703,7 +36399,9 @@
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_cv_berk_database=db
+-
++ (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
-+
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
++ ac_header_preproc=no
fi
-+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-@@ -33721,16 +36419,16 @@
+-LIBS=$kde_db_safe_LIBS
+-LDFLAGS=$kde_safe_LDFLAGS
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
- case "$kde_cv_berk_database" in
- NO)
++# 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;}
+
++ ;;
++esac
++{ 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
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+-
+-kde_db_header=""
+-DBSEARCHENGINE=dbsearchengine
+-
+-case "$kde_cv_berk_database" in
+- 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; }
- LIB_DBIV=""
- DBSEARCHENGINE=""
- ;;
- db)
- LIB_DBIV="-l$ac_db_name"
- kde_db_header=db.h
+- LIB_DBIV=""
+- DBSEARCHENGINE=""
+- ;;
+- db)
+- LIB_DBIV="-l$ac_db_name"
+- kde_db_header=db.h
- echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
-echo "${ECHO_T}-l$ac_db_name" >&6
-+ { echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
-+echo "${ECHO_T}-l$ac_db_name" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_DB_DB_H 1
-@@ -33740,8 +36438,8 @@
- db4-db)
- LIB_DBIV='-ldb4'
- kde_db_header=db.h
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
+-
+- ;;
+- db4-db)
+- LIB_DBIV='-ldb4'
+- kde_db_header=db.h
- echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
-echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6
-+ { echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
-+echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_DB_DB_H 1
-@@ -33751,8 +36449,8 @@
- db4)
- LIB_DBIV='-ldb4'
- kde_db_header=db4/db.h
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
+-
+- ;;
+- db4)
+- LIB_DBIV='-ldb4'
+- kde_db_header=db4/db.h
- echo "$as_me:$LINENO: result: -ldb4" >&5
-echo "${ECHO_T}-ldb4" >&6
-+ { echo "$as_me:$LINENO: result: -ldb4" >&5
-+echo "${ECHO_T}-ldb4" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_DB4_DB_H 1
-@@ -33762,8 +36460,8 @@
- $ac_db_name)
- LIB_DBIV="-l$ac_db_name"
- kde_db_header="$ac_db_include_file"
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB4_DB_H 1
+-_ACEOF
+-
+- ;;
+- $ac_db_name)
+- LIB_DBIV="-l$ac_db_name"
+- kde_db_header="$ac_db_include_file"
- echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
-echo "${ECHO_T}user specified $ac_db_name" >&6
-+ { echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
-+echo "${ECHO_T}user specified $ac_db_name" >&6; }
- if test "x$ac_db_include_file" = "xdb.h" ; then
+- if test "x$ac_db_include_file" = "xdb.h" ; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DB_DB_H 1
+-_ACEOF
+-
+- else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define USE_DB_H_PATH <$ac_db_include_file>
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
- cat >>confdefs.h <<_ACEOF
-@@ -33816,8 +36514,7 @@
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
+- fi
+-
+- ;;
+-esac
+-
+-DBIV_LDFLAGS="$ac_db_libraries"
+-DBIV_INCLUDES="$ac_db_includes"
+-DBIV_NAME="$ac_db_name"
+-
+-if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
+- { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
+-echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+ fi
++done
+
+
-
+-
+-
+-
+-
+-
+-if test -n "$DBSEARCHENGINE"; then
+- include_DBSEARCHENGINE_TRUE=
+- include_DBSEARCHENGINE_FALSE='#'
++for ac_func in getpagesize
++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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- include_DBSEARCHENGINE_TRUE='#'
+- include_DBSEARCHENGINE_FALSE=
+-fi
+-
+-
+-
+-
+-HAVE_KCAL=0
+-
+- kde_safe_cppflags=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $all_includes"
++ 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. */
+
- 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'
-@@ -33827,17 +36524,17 @@
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_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
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++#undef $ac_func
- if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
++/* 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
++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
++#endif
+
+- if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
- echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
-+echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
+-if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
- else
- # Is the header compilable?
+-else
+- # Is the header compilable?
-echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
-echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
-+echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
+-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 <libkcal/resourcecalendar.h>
++int
++main ()
++{
++return $ac_func ();
++ ;
++ return 0;
++}
_ACEOF
-@@ -33848,24 +36545,36 @@
- #include <libkcal/resourcecalendar.h>
- _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
-+if { (ac_try="$ac_compile"
++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_compile") 2>conftest.er1
++ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -37478,7 +38576,7 @@
- || 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -37488,9 +38586,10 @@
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_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
++ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -37500,61 +38599,255 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33874,15 +36583,16 @@
+- ac_header_compiler=yes
++ eval "$as_ac_var=yes"
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-+ ac_header_compiler=no
++ eval "$as_ac_var=no"
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-+{ 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 libkcal/resourcecalendar.h presence" >&5
-echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
-+echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++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
++_ACEOF
++
++fi
++done
++
++{ echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$cross_compiling" = yes; then
++ ac_cv_func_mmap_fixed_mapped=no
++else
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33891,8 +36601,13 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <libkcal/resourcecalendar.h>
+-#include <libkcal/resourcecalendar.h>
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
++
++/* Thanks to Mike Haertel and Jim Avera for this test.
++ Here is a matrix of mmap possibilities:
++ mmap private not fixed
++ mmap private fixed at somewhere currently unmapped
++ mmap private fixed at somewhere already mapped
++ mmap shared not fixed
++ mmap shared fixed at somewhere currently unmapped
++ mmap shared fixed at somewhere already mapped
++ For private mappings, we should verify that changes cannot be read()
++ back from the file, nor mmap's back from the file at a different
++ address. (There have been systems where private was not correctly
++ implemented like the infamous i386 svr4.0, and systems where the
++ VM page cache was not coherent with the file system buffer cache
++ like early versions of FreeBSD and possibly contemporary NetBSD.)
++ For shared mappings, we should conversely verify that changes get
++ propagated back to all the places they're supposed to be.
++
++ Grep wants private fixed already mapped.
++ The main things grep needs to know about mmap are:
++ * does it exist and is it safe to write into the mmap'd area
++ * how to use it (BSD variants) */
++
++#include <fcntl.h>
++#include <sys/mman.h>
++
++#if !STDC_HEADERS && !HAVE_STDLIB_H
++char *malloc ();
++#endif
++
++/* This mess was copied from the GNU getpagesize.h. */
++#if !HAVE_GETPAGESIZE
++/* Assume that all systems that can run configure have sys/param.h. */
++# if !HAVE_SYS_PARAM_H
++# define HAVE_SYS_PARAM_H 1
++# endif
++
++# ifdef _SC_PAGESIZE
++# define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++# if HAVE_SYS_PARAM_H
++# include <sys/param.h>
++# ifdef EXEC_PAGESIZE
++# define getpagesize() EXEC_PAGESIZE
++# else /* no EXEC_PAGESIZE */
++# ifdef NBPG
++# define getpagesize() NBPG * CLSIZE
++# ifndef CLSIZE
++# define CLSIZE 1
++# endif /* no CLSIZE */
++# else /* no NBPG */
++# ifdef NBPC
++# define getpagesize() NBPC
++# else /* no NBPC */
++# ifdef PAGESIZE
++# define getpagesize() PAGESIZE
++# endif /* PAGESIZE */
++# endif /* no NBPC */
++# endif /* no NBPG */
++# endif /* no EXEC_PAGESIZE */
++# else /* no HAVE_SYS_PARAM_H */
++# define getpagesize() 8192 /* punt totally */
++# endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
++
++#endif /* no HAVE_GETPAGESIZE */
++
++int
++main ()
++{
++ char *data, *data2, *data3;
++ int i, pagesize;
++ int fd;
++
++ pagesize = getpagesize ();
++
++ /* First, make a file with some known garbage in it. */
++ data = (char *) malloc (pagesize);
++ if (!data)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ *(data + i) = rand ();
++ umask (0);
++ fd = creat ("conftest.mmap", 0600);
++ if (fd < 0)
++ return 1;
++ if (write (fd, data, pagesize) != pagesize)
++ return 1;
++ close (fd);
++
++ /* Next, try to mmap the file at a fixed address which already has
++ something else allocated at it. If we can, also make sure that
++ we see the same garbage. */
++ fd = open ("conftest.mmap", O_RDWR);
++ if (fd < 0)
++ return 1;
++ data2 = (char *) malloc (2 * pagesize);
++ if (!data2)
++ return 1;
++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++ MAP_PRIVATE | MAP_FIXED, fd, 0L))
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data2 + i))
++ return 1;
++
++ /* Finally, make sure that changes to the mapped area do not
++ percolate back to the file as seen by read(). (This is a bug on
++ some variants of i386 svr4.0.) */
++ for (i = 0; i < pagesize; ++i)
++ *(data2 + i) = *(data2 + i) + 1;
++ data3 = (char *) malloc (pagesize);
++ if (!data3)
++ return 1;
++ if (read (fd, data3, pagesize) != pagesize)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data3 + i))
++ return 1;
++ close (fd);
++ return 0;
++}
_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"
++rm -f 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_cpp conftest.$ac_ext") 2>conftest.er1
++ (eval "$ac_link") 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -33916,9 +36631,10 @@
+- 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
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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_mmap_fixed_mapped=yes
+ 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
+ sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
+- ac_header_preproc=no
++( exit $ac_status )
++ac_cv_func_mmap_fixed_mapped=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
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
-@@ -33942,25 +36658,18 @@
- echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: libkcal/resourcecalendar.h: 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
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -37563,153 +38856,307 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
+- ;;
+-esac
-echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
-+echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+-if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_MMAP 1
++_ACEOF
++
++fi
++rm -f conftest.mmap
++
++
++
++
++# Check whether --with-subversion was given.
++if test "${with_subversion+set}" = set; then
++ withval=$with_subversion;
else
- ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
+- ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
++ with_subversion=check
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
++
++
++SVN_SUBDIR=""
++if test "x$with_subversion" != xno; then
++
++APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
++SVN_SUBDIR="svn"
++
++# Check whether --with-apr-config was given.
++if test "${with_apr_config+set}" = set; then
++ withval=$with_apr_config;
++ if test "$withval" != "yes" -a "$withval" != ""; then
++ APR_CONFIGS=$withval
++ fi
fi
- if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
-@@ -34001,18 +36710,19 @@
- for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
+- HAVE_KCAL=1
++
++{ echo "$as_me:$LINENO: checking for APR" >&5
++echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
++APR_CONFIG=""
++for VALUE in $APR_CONFIGS ; do
++ if $VALUE --cflags > /dev/null; then
++ APR_CONFIG=$VALUE
++ break
++ fi
++done
++test $VALUE && APR_CONFIG=$VALUE
++if test $APR_CONFIG ; then
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
+ else
+- { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
+- resource for KOrganizer won't be compiled." >&5
+-echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
+- resource for KOrganizer won't be compiled." >&2;}
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++ SVN_SUBDIR=
+ fi
+
++APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
++APR_INCLUDE="`$APR_CONFIG --includes`"
++APR_LIBS="`$APR_CONFIG --link-ld --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
+
+- CPPFLAGS=$kde_safe_cppflags
++APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
+
++# Check whether --with-apu-config was given.
++if test "${with_apu_config+set}" = set; then
++ withval=$with_apu_config;
++ if test "$withval" != "yes" -a "$withval" != ""; then
++ APU_CONFIGS=$withval
++ fi
+
++fi
+
+-if test "$HAVE_KCAL" = 1; then
+- include_kcalresource_TRUE=
+- include_kcalresource_FALSE='#'
++{ echo "$as_me:$LINENO: checking for APR util" >&5
++echo $ECHO_N "checking for APR util... $ECHO_C" >&6; }
++APU_CONFIG=""
++for VALUE in $APU_CONFIGS ; do
++ if $VALUE --includes > /dev/null; then
++ APU_CONFIG=$VALUE
++ break
++ fi
++done
++if test $APU_CONFIG ; then
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
+ else
+- include_kcalresource_TRUE='#'
+- include_kcalresource_FALSE=
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++ SVN_SUBDIR=
+ fi
++APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
++APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
+
++{ echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
++echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6; }
+
++# Check whether --with-subversion-dir was given.
++if test "${with_subversion_dir+set}" = set; then
++ withval=$with_subversion_dir;
++ SVNCONFIG="$withval/bin/svn-config"
+
+-KCACHEGRIND_VERSION=0.4.6kde
++fi
+
+
++if test -z "$SVNCONFIG"; then
++ _SVNCONFIG="`svn-config --prefix 2> /dev/null`"
++ if test -n "$_SVNCONFIG"; then
++ SVNCONFIG="$_SVNCONFIG/bin/svn-config"
++ fi
++fi
+
+
+-for ac_header in stdlib.h unistd.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 $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?
+-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
-@@ -34023,24 +36733,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
+-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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -34049,15 +36771,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
++if test -x "$SVNCONFIG"; then
++ SVNLD="`$SVNCONFIG --ldflags`"
++ SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
++ SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
++ SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
++ { 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: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++ SVNLD=""
++ SVN_INCLUDES="/usr/local/include /usr/include"
-ac_header_compiler=no
-+ ac_header_compiler=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
++# Check whether --with-svn-include was given.
++if test "${with_svn_include+set}" = set; then
++ withval=$with_svn_include;
++ if test "$withval" != "yes" -a "$withval" != ""; then
++ SVN_INCLUDES=$withval
++ fi
- # 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
-@@ -34066,8 +36789,13 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
+-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
-+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
-@@ -34091,9 +36819,10 @@
+- ac_status=$?
+- 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
+- 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; }
++ { echo "$as_me:$LINENO: checking for Subversion headers" >&5
++echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6; }
++ SVN_INCLUDE=""
++ for VALUE in $SVN_INCLUDES ; do
++ if test -f $VALUE/subversion-1/svn_types.h ; then
++ SVN_INCLUDE="-I$VALUE"
++ break
++ fi
++ done
++ if test $SVN_INCLUDE ; then
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++ SVN_SUBDIR=
++ fi
++ SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
++
++# Check whether --with-svn-lib was given.
++if test "${with_svn_lib+set}" = set; then
++ withval=$with_svn_lib;
++ if test "$withval" != "yes" -a "$withval" != ""; then
++ SVN_LIBS=$withval
++ fi
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34117,25 +36846,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;}
+-# 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
-## ------------------------------------------ ##
@@ -37718,73 +39165,130 @@
-_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 "$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"
+- 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; }
++ { echo "$as_me:$LINENO: checking for Subversion libraries" >&5
++echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6; }
++ SVN_LIB=""
++ for VALUE in $SVN_LIBS ; do
++ if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
++ SVN_LIB="-L$VALUE"
++ break
++ fi
++ done
++ if test $SVN_LIB ; then
++ { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
++ SVN_SUBDIR=
++ fi
fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34151,9 +36874,9 @@
- for ac_func in getpagesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
++SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
++SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+
++if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
++ { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
++echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ fi
+
+-done
+
+
+-for ac_func in getpagesize
+-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
-@@ -34179,53 +36902,59 @@
+- 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
- #undef $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. */
-+/* 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"
+-#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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
- #endif
+-#endif
++if test -n "$SVN_SUBDIR"; then
++ include_kioslave_svn_TRUE=
++ include_kioslave_svn_FALSE='#'
++else
++ include_kioslave_svn_TRUE='#'
++ include_kioslave_svn_FALSE=
++fi
++
++
++
++case "$host" in
++ *-gnu)
++ saved_LIBS="$LIBS"
++ LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
++ 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 f != $ac_func;
-+return $ac_func ();
++
;
return 0;
}
@@ -37831,368 +39335,696 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34234,13 +36963,15 @@
+- eval "$as_ac_var=yes"
++ kde_compile_kmtrace=$GCC
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
++ kde_compile_kmtrace=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- fi
+-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
-@@ -34249,8 +36980,8 @@
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++ KMTRACE_LIBS=$LIBS
++
++ LIBS="$saved_LIBS"
++ ;;
++ *)
++ kde_compile_kmtrace=no
++ ;;
++esac
+
++if test ! "x$kde_compile_kmtrace" = "xyes"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
fi
- done
+-done
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working mmap" >&5
-+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
- if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; 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'
++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 "${ac_cv_header_FlexLexer_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
else
-@@ -34345,15 +37076,15 @@
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
+- if test "$cross_compiling" = yes; then
+- ac_cv_func_mmap_fixed_mapped=no
+-else
+- cat >conftest.$ac_ext <<_ACEOF
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
++echo $ECHO_N "checking FlexLexer.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
+-/* malloc might have been renamed as rpl_malloc. */
+-#undef malloc
+-
+-/* Thanks to Mike Haertel and Jim Avera for this test.
+- Here is a matrix of mmap possibilities:
+- mmap private not fixed
+- mmap private fixed at somewhere currently unmapped
+- mmap private fixed at somewhere already mapped
+- mmap shared not fixed
+- mmap shared fixed at somewhere currently unmapped
+- mmap shared fixed at somewhere already mapped
+- For private mappings, we should verify that changes cannot be read()
+- back from the file, nor mmap's back from the file at a different
+- address. (There have been systems where private was not correctly
+- implemented like the infamous i386 svr4.0, and systems where the
+- VM page cache was not coherent with the file system buffer cache
+- like early versions of FreeBSD and possibly contemporary NetBSD.)
+- For shared mappings, we should conversely verify that changes get
+- propagated back to all the places they're supposed to be.
+-
+- Grep wants private fixed already mapped.
+- The main things grep needs to know about mmap are:
+- * does it exist and is it safe to write into the mmap'd area
+- * how to use it (BSD variants) */
+-
+-#include <fcntl.h>
+-#include <sys/mman.h>
+-
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
+-char *malloc ();
+-#endif
+-
+-/* This mess was copied from the GNU getpagesize.h. */
+-#if !HAVE_GETPAGESIZE
+-/* Assume that all systems that can run configure have sys/param.h. */
+-# if !HAVE_SYS_PARAM_H
+-# define HAVE_SYS_PARAM_H 1
+-# endif
+-
+-# ifdef _SC_PAGESIZE
+-# define getpagesize() sysconf(_SC_PAGESIZE)
+-# else /* no _SC_PAGESIZE */
+-# if HAVE_SYS_PARAM_H
+-# include <sys/param.h>
+-# ifdef EXEC_PAGESIZE
+-# define getpagesize() EXEC_PAGESIZE
+-# else /* no EXEC_PAGESIZE */
+-# ifdef NBPG
+-# define getpagesize() NBPG * CLSIZE
+-# ifndef CLSIZE
+-# define CLSIZE 1
+-# endif /* no CLSIZE */
+-# else /* no NBPG */
+-# ifdef NBPC
+-# define getpagesize() NBPC
+-# else /* no NBPC */
+-# ifdef PAGESIZE
+-# define getpagesize() PAGESIZE
+-# endif /* PAGESIZE */
+-# endif /* no NBPC */
+-# endif /* no NBPG */
+-# endif /* no EXEC_PAGESIZE */
+-# else /* no HAVE_SYS_PARAM_H */
+-# define getpagesize() 8192 /* punt totally */
+-# endif /* no HAVE_SYS_PARAM_H */
+-# endif /* no _SC_PAGESIZE */
+-
+-#endif /* no HAVE_GETPAGESIZE */
+-
+-int
+-main ()
+-{
+- char *data, *data2, *data3;
+- int i, pagesize;
+- int fd;
+-
+- pagesize = getpagesize ();
+-
+- /* First, make a file with some known garbage in it. */
+- data = (char *) malloc (pagesize);
+- if (!data)
- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
+- for (i = 0; i < pagesize; ++i)
+- *(data + i) = rand ();
+- umask (0);
+- fd = creat ("conftest.mmap", 0600);
+- if (fd < 0)
- exit (1);
-+ return 1;
- if (write (fd, data, pagesize) != pagesize)
+- if (write (fd, data, pagesize) != pagesize)
- exit (1);
-+ return 1;
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
-@@ -34361,17 +37092,17 @@
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
+- close (fd);
+-
+- /* Next, try to mmap the file at a fixed address which already has
+- something else allocated at it. If we can, also make sure that
+- we see the same garbage. */
+- fd = open ("conftest.mmap", O_RDWR);
+- if (fd < 0)
- exit (1);
-+ return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
+- data2 = (char *) malloc (2 * pagesize);
+- if (!data2)
- exit (1);
- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
-+ return 1;
-+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
+- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data2 + i))
- exit (1);
-+ return 1;
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
-@@ -34380,24 +37111,33 @@
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
+-
+- /* Finally, make sure that changes to the mapped area do not
+- percolate back to the file as seen by read(). (This is a bug on
+- some variants of i386 svr4.0.) */
+- for (i = 0; i < pagesize; ++i)
+- *(data2 + i) = *(data2 + i) + 1;
+- data3 = (char *) malloc (pagesize);
+- if (!data3)
- exit (1);
-+ return 1;
- if (read (fd, data3, pagesize) != pagesize)
+- if (read (fd, data3, pagesize) != pagesize)
- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data3 + i))
- exit (1);
-+ return 1;
- close (fd);
+- close (fd);
- exit (0);
-+ return 0;
- }
+-}
++#include <FlexLexer.h>
_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
-+if { (ac_try="$ac_link"
++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_link") 2>&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
++ grep -v '^ *+' 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='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
++ (exit $ac_status); } &&
++ { 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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34410,11 +37150,13 @@
- ( exit $ac_status )
- ac_cv_func_mmap_fixed_mapped=no
- fi
+- ac_cv_func_mmap_fixed_mapped=yes
++ 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
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-( exit $ac_status )
+-ac_cv_func_mmap_fixed_mapped=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
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
+-if test $ac_cv_func_mmap_fixed_mapped = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MMAP 1
+-_ACEOF
+-
++ ac_header_compiler=no
+ fi
+-rm -f conftest.mmap
+-
+-
- cat >>confdefs.h <<\_ACEOF
-@@ -34427,13 +37169,13 @@
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-
-# Check whether --with-subversion or --without-subversion was given.
-+# Check whether --with-subversion was given.
- if test "${with_subversion+set}" = set; then
+-if test "${with_subversion+set}" = set; then
- withval="$with_subversion"
-
-+ withval=$with_subversion;
- else
- with_subversion=check
+-else
+- with_subversion=check
-fi;
-+fi
-+
-
- SVN_SUBDIR=""
- if test "x$with_subversion" != xno; then
-@@ -34441,17 +37183,17 @@
- APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
- SVN_SUBDIR="svn"
-
+-
+-SVN_SUBDIR=""
+-if test "x$with_subversion" != xno; then
+-
+-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
+-SVN_SUBDIR="svn"
+-
-# Check whether --with-apr-config or --without-apr-config was given.
-+# Check whether --with-apr-config was given.
- if test "${with_apr_config+set}" = set; then
+-if test "${with_apr_config+set}" = set; then
- withval="$with_apr_config"
-
-+ withval=$with_apr_config;
- if test "$withval" != "yes" -a "$withval" != ""; then
- APR_CONFIGS=$withval
- fi
-
+- if test "$withval" != "yes" -a "$withval" != ""; then
+- APR_CONFIGS=$withval
+- fi
+-
-fi;
-echo "$as_me:$LINENO: checking for APR" >&5
-echo $ECHO_N "checking for APR... $ECHO_C" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for APR" >&5
-+echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
- APR_CONFIG=""
- for VALUE in $APR_CONFIGS ; do
- if $VALUE --cflags > /dev/null; then
-@@ -34461,11 +37203,11 @@
- done
- test $VALUE && APR_CONFIG=$VALUE
- if test $APR_CONFIG ; then
+-APR_CONFIG=""
+-for VALUE in $APR_CONFIGS ; do
+- if $VALUE --cflags > /dev/null; then
+- APR_CONFIG=$VALUE
+- break
+- fi
+-done
+-test $VALUE && APR_CONFIG=$VALUE
+-if test $APR_CONFIG ; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
++# Is the header present?
++{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
++echo $ECHO_N "checking FlexLexer.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 <FlexLexer.h>
++_ACEOF
++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_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
else
- 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; }
- SVN_SUBDIR=
+- SVN_SUBDIR=
++ 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
-@@ -34476,17 +37218,17 @@
+-APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
+-APR_INCLUDE="`$APR_CONFIG --includes`"
+-APR_LIBS="`$APR_CONFIG --link-ld --libs`"
+-
++ ac_header_preproc=no
++fi
- APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
+-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
-# Check whether --with-apu-config or --without-apu-config was given.
-+# Check whether --with-apu-config was given.
- if test "${with_apu_config+set}" = set; then
+-if test "${with_apu_config+set}" = set; then
- withval="$with_apu_config"
--
-+ withval=$with_apu_config;
- if test "$withval" != "yes" -a "$withval" != ""; then
- APU_CONFIGS=$withval
- fi
++# 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: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
+- if test "$withval" != "yes" -a "$withval" != ""; then
+- APU_CONFIGS=$withval
+- fi
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
++echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_FlexLexer_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
++echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
+
-fi;
-echo "$as_me:$LINENO: checking for APR util" >&5
-echo $ECHO_N "checking for APR util... $ECHO_C" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for APR util" >&5
-+echo $ECHO_N "checking for APR util... $ECHO_C" >&6; }
- APU_CONFIG=""
- for VALUE in $APU_CONFIGS ; do
- if $VALUE --includes > /dev/null; then
-@@ -34495,26 +37237,26 @@
- fi
- done
- if test $APU_CONFIG ; then
+-APU_CONFIG=""
+-for VALUE in $APU_CONFIGS ; do
+- if $VALUE --includes > /dev/null; then
+- APU_CONFIG=$VALUE
+- break
+- fi
+-done
+-if test $APU_CONFIG ; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
++fi
++if test $ac_cv_header_FlexLexer_h = yes; then
++ kde_have_flex=yes
else
- 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; }
- SVN_SUBDIR=
+- SVN_SUBDIR=
++ kde_have_flex=no
fi
- APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
- APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
+-APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
+-APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
-echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
-echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
-+echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6; }
-# Check whether --with-subversion-dir or --without-subversion-dir was given.
-+# Check whether --with-subversion-dir was given.
- if test "${with_subversion_dir+set}" = set; then
+-if test "${with_subversion_dir+set}" = set; then
- withval="$with_subversion_dir"
--
-+ withval=$with_subversion_dir;
- SVNCONFIG="$withval/bin/svn-config"
--fi;
+- SVNCONFIG="$withval/bin/svn-config"
++if test "$kde_have_flex" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
+fi
-+
- if test -z "$SVNCONFIG"; then
- _SVNCONFIG="`svn-config --prefix 2> /dev/null`"
-@@ -34529,25 +37271,25 @@
- SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
- SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
- SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
+-fi;
+
+-if test -z "$SVNCONFIG"; then
+- _SVNCONFIG="`svn-config --prefix 2> /dev/null`"
+- if test -n "$_SVNCONFIG"; then
+- SVNCONFIG="$_SVNCONFIG/bin/svn-config"
+- 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
+
+
+-if test -x "$SVNCONFIG"; then
+- SVNLD="`$SVNCONFIG --ldflags`"
+- SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+- SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
+- SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++
++
++for ac_func in setenv
++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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- 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; }
- SVNLD=""
- SVN_INCLUDES="/usr/local/include /usr/include"
+- SVNLD=""
+- SVN_INCLUDES="/usr/local/include /usr/include"
++ 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
-# Check whether --with-svn-include or --without-svn-include was given.
-+# Check whether --with-svn-include was given.
- if test "${with_svn_include+set}" = set; then
+-if test "${with_svn_include+set}" = set; then
- withval="$with_svn_include"
--
-+ withval=$with_svn_include;
- if test "$withval" != "yes" -a "$withval" != ""; then
- SVN_INCLUDES=$withval
- 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. */
+- if test "$withval" != "yes" -a "$withval" != ""; then
+- SVN_INCLUDES=$withval
+- fi
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+
-fi;
- echo "$as_me:$LINENO: checking for Subversion headers" >&5
-echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: checking for Subversion headers" >&5
-+echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6; }
- SVN_INCLUDE=""
- for VALUE in $SVN_INCLUDES ; do
- if test -f $VALUE/subversion-1/svn_types.h ; then
-@@ -34556,26 +37298,26 @@
- fi
- done
- if test $SVN_INCLUDE ; then
+- SVN_INCLUDE=""
+- for VALUE in $SVN_INCLUDES ; do
+- if test -f $VALUE/subversion-1/svn_types.h ; then
+- SVN_INCLUDE="-I$VALUE"
+- break
+- fi
+- done
+- if test $SVN_INCLUDE ; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
+- else
- 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; }
- SVN_SUBDIR=
- fi
- SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
+- SVN_SUBDIR=
+- fi
+- SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
++#undef $ac_func
-# Check whether --with-svn-lib or --without-svn-lib was given.
-+# Check whether --with-svn-lib was given.
- if test "${with_svn_lib+set}" = set; then
+-if test "${with_svn_lib+set}" = set; then
- withval="$with_svn_lib"
--
-+ withval=$with_svn_lib;
- if test "$withval" != "yes" -a "$withval" != ""; then
- SVN_LIBS=$withval
- fi
++/* 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
++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
++#endif
+- if test "$withval" != "yes" -a "$withval" != ""; then
+- SVN_LIBS=$withval
+- fi
++int
++main ()
++{
++return $ac_func ();
++ ;
++ return 0;
++}
++_ACEOF
++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'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_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"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
-fi;
- echo "$as_me:$LINENO: checking for Subversion libraries" >&5
-echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: checking for Subversion libraries" >&5
-+echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6; }
- SVN_LIB=""
- for VALUE in $SVN_LIBS ; do
- if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
-@@ -34584,11 +37326,11 @@
- fi
- done
- if test $SVN_LIB ; then
+- SVN_LIB=""
+- for VALUE in $SVN_LIBS ; do
+- if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
+- SVN_LIB="-L$VALUE"
+- break
+- fi
+- done
+- if test $SVN_LIB ; then
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
+- else
- 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; }
- SVN_SUBDIR=
- fi
+- SVN_SUBDIR=
+- fi
++ eval "$as_ac_var=no"
fi
-@@ -34639,24 +37381,36 @@
- }
+-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+-SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
+-SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+
+-if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
+- { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
+-echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
+- { (exit 1); exit 1; }; }
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++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
++_ACEOF
++
+ fi
++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
+
+
+-if test -n "$SVN_SUBDIR"; then
+- include_kioslave_svn_TRUE=
+- include_kioslave_svn_FALSE='#'
+-else
+- include_kioslave_svn_TRUE='#'
+- include_kioslave_svn_FALSE=
++if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for libxml2/libxml/xmlmemory.h" >&5
++echo $ECHO_N "checking for libxml2/libxml/xmlmemory.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-
+-
+-
+-case "$host" in
+- *-gnu)
+- saved_LIBS="$LIBS"
+- LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
+- cat >conftest.$ac_ext <<_ACEOF
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml2_libxml_xmlmemory_h" >&5
++echo "${ECHO_T}$ac_cv_header_libxml2_libxml_xmlmemory_h" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking libxml2/libxml/xmlmemory.h usability" >&5
++echo $ECHO_N "checking libxml2/libxml/xmlmemory.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++$ac_includes_default
++#include <libxml2/libxml/xmlmemory.h>
++_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_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_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_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -38200,68 +40032,197 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&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); }; } &&
++ { 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_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-int
+-main ()
+-{
++ ac_header_compiler=no
++fi
+
+- ;
+- return 0;
+-}
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking libxml2/libxml/xmlmemory.h presence" >&5
++echo $ECHO_N "checking libxml2/libxml/xmlmemory.h presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <libxml2/libxml/xmlmemory.h>
++_ACEOF
++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); }; }; then
-@@ -34665,8 +37419,9 @@
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&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_compile_kmtrace=$GCC
++ (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
-kde_compile_kmtrace=no
-+ kde_compile_kmtrace=no
++ ac_header_preproc=no
fi
-+
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- KMTRACE_LIBS=$LIBS
-@@ -34683,8 +37438,7 @@
- fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- KMTRACE_LIBS=$LIBS
+- LIBS="$saved_LIBS"
+- ;;
+- *)
+- kde_compile_kmtrace=no
+- ;;
+-esac
++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 ! "x$kde_compile_kmtrace" = "xyes"; then
+- DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
+-fi
++# 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: libxml2/libxml/xmlmemory.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxml2/libxml/xmlmemory.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libxml2/libxml/xmlmemory.h: in the future, the compiler will take precedence" >&2;}
+
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for libxml2/libxml/xmlmemory.h" >&5
++echo $ECHO_N "checking for libxml2/libxml/xmlmemory.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libxml2_libxml_xmlmemory_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_libxml2_libxml_xmlmemory_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libxml2_libxml_xmlmemory_h" >&5
++echo "${ECHO_T}$ac_cv_header_libxml2_libxml_xmlmemory_h" >&6; }
+
++fi
++if test $ac_cv_header_libxml2_libxml_xmlmemory_h = yes; then
++ have_libxml2=yes
++else
++ have_libxml2=no
++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'
-@@ -34694,17 +37448,17 @@
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_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 "${ac_cv_header_FlexLexer_h+set}" = set; then
++if test "$have_libxml2" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++fi
+
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
- echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
++echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
++echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-+echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libxslt/xslt.h usability" >&5
++echo $ECHO_N "checking libxslt/xslt.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34715,24 +37469,36 @@
- #include <FlexLexer.h>
+@@ -34712,27 +37929,39 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <FlexLexer.h>
++#include <libxslt/xslt.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -38283,7 +40244,7 @@
- || 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -38305,31 +40266,34 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34741,15 +37507,16 @@
+@@ -34741,25 +37970,31 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-+echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking libxslt/xslt.h presence" >&5
++echo $ECHO_N "checking libxslt/xslt.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34758,8 +37525,13 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <FlexLexer.h>
+-#include <FlexLexer.h>
++#include <libxslt/xslt.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -38343,7 +40307,18 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34783,9 +37555,10 @@
+@@ -34767,8 +38002,8 @@
+ 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
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+@@ -34783,175 +38018,326 @@
ac_header_preproc=no
fi
@@ -38355,11 +40330,32 @@
+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
-@@ -34809,25 +37582,18 @@
- echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: FlexLexer.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: FlexLexer.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -38368,139 +40364,426 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libxslt/xslt.h: in the future, the compiler will take precedence" >&2;}
+
;;
esac
-echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-if test "${ac_cv_header_FlexLexer_h+set}" = set; then
++{ echo "$as_me:$LINENO: checking for libxslt/xslt.h" >&5
++echo $ECHO_N "checking for libxslt/xslt.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_libxslt_xslt_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_FlexLexer_h=$ac_header_preproc
+- ac_cv_header_FlexLexer_h=$ac_header_preproc
++ ac_cv_header_libxslt_xslt_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libxslt_xslt_h" >&5
++echo "${ECHO_T}$ac_cv_header_libxslt_xslt_h" >&6; }
fi
- if test $ac_cv_header_FlexLexer_h = yes; then
-@@ -34855,9 +37621,9 @@
- for ac_func in setenv
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-if test $ac_cv_header_FlexLexer_h = yes; then
+- kde_have_flex=yes
++if test $ac_cv_header_libxslt_xslt_h = yes; then
++ have_libxslt=yes
+ else
+- kde_have_flex=no
++ have_libxslt=no
++fi
++
++
++
++if test "$have_libxslt" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++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
++
++
++
++
++
++HAVE_XSLT=yes
++
++
++ { 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 { 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 $dirs"
++ else dirs="$dirs ${prefix}/bin ${exec_prefix}/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 { 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 $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
++
++
++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;}
++ HAVE_XSLT=no
++ fi
+ fi
+
++if test "$HAVE_XSLT" = yes; then
++
++
++ { 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 { 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 $dirs"
++ else dirs="$dirs ${prefix}/bin ${exec_prefix}/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"
+
+
+-if test "$kde_have_flex" = "no"; then
+- DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
+ 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
+-
+-
++ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+
++ fi
+
+-for ac_func in setenv
+-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
-@@ -34883,53 +37649,59 @@
+- 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
++ 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; }
- #undef $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. */
++ { 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;}
++ HAVE_XSLT=no
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++ else
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
++ XSLT_CONFIG=$kde_cv_path
+
+-#undef $ac_func
++ fi
+
-/* 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"
+-#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)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
+-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
- #endif
+-#endif
- int
- main ()
- {
+-int
+-main ()
+-{
-return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+- ;
+- 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_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (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_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -34938,13 +37710,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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
++ 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`"
-eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++ 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;}
++ HAVE_XSLT=no
++ fi
++ fi
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
-@@ -34975,8 +37749,8 @@
+-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 "$HAVE_XSLT" = no; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
fi
+-done
++
++
++
++
++
++
+
+
+@@ -34976,8 +38362,8 @@
+ fi
+
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
@@ -38509,7 +40792,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -34987,8 +37761,8 @@
+@@ -34988,8 +38374,8 @@
else
install_it="no"
fi
@@ -38520,7 +40803,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -35200,243 +37974,243 @@
+@@ -35201,245 +38587,247 @@
umbrello_SUBDIR_included_FALSE=
fi
@@ -38848,42 +41131,47 @@
- ac_config_files="$ac_config_files umbrello/umbrello/autolayout/Makefile"
+ac_config_files="$ac_config_files umbrello/umbrello/autolayout/Makefile"
-- ac_config_files="$ac_config_files umbrello/umbrello/classparser/Makefile"
-+ac_config_files="$ac_config_files umbrello/umbrello/classparser/Makefile"
-
- ac_config_files="$ac_config_files umbrello/umbrello/clipboard/Makefile"
+ac_config_files="$ac_config_files umbrello/umbrello/clipboard/Makefile"
- ac_config_files="$ac_config_files umbrello/umbrello/codegenerators/Makefile"
+ac_config_files="$ac_config_files umbrello/umbrello/codegenerators/Makefile"
+- ac_config_files="$ac_config_files umbrello/umbrello/codeimport/Makefile"
++ac_config_files="$ac_config_files umbrello/umbrello/codeimport/Makefile"
+
+- ac_config_files="$ac_config_files umbrello/umbrello/codeimport/kdevcppparser/Makefile"
++ac_config_files="$ac_config_files umbrello/umbrello/codeimport/kdevcppparser/Makefile"
+
- ac_config_files="$ac_config_files umbrello/umbrello/dialogs/Makefile"
+ac_config_files="$ac_config_files umbrello/umbrello/dialogs/Makefile"
- ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
-+ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
++ac_config_files="$ac_config_files umbrello/umbrello/docgenerators/Makefile"
- ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
-+ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
++ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
- ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
-+ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
++ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
- ac_config_files="$ac_config_files kcachegrind/version.h"
-+ac_config_files="$ac_config_files kcachegrind/version.h"
++ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
- ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
-+ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
++ac_config_files="$ac_config_files kcachegrind/version.h"
- ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
-+ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
++ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
- ac_config_files="$ac_config_files kmtrace/kminspector"
++ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
++
+ac_config_files="$ac_config_files kmtrace/kminspector"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -35456,39 +38230,58 @@
+@@ -35459,39 +38847,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -38958,7 +41246,7 @@
fi
fi
rm -f confcache
-@@ -35497,38 +38290,31 @@
+@@ -35500,38 +38907,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -39010,7 +41298,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -35763,11 +38549,35 @@
+@@ -35766,11 +39166,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -39048,7 +41336,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -35776,8 +38586,43 @@
+@@ -35779,8 +39203,43 @@
fi
@@ -39093,7 +41381,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -35791,18 +38636,19 @@
+@@ -35794,18 +39253,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -39116,7 +41404,7 @@
as_basename=basename
else
as_basename=false
-@@ -35810,159 +38656,120 @@
+@@ -35813,159 +39273,120 @@
# Name of the executable.
@@ -39347,7 +41635,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -35971,7 +38778,19 @@
+@@ -35974,7 +39395,19 @@
as_mkdir_p=false
fi
@@ -39368,7 +41656,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -35980,31 +38799,14 @@
+@@ -35983,31 +39416,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -39400,11 +41688,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -36012,30 +38814,20 @@
+@@ -36015,30 +39431,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -39443,7 +41731,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -36062,19 +38854,21 @@
+@@ -36065,19 +39471,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -39455,7 +41743,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.59d,
++configured by $0, generated by GNU Autoconf 2.60,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -39471,7 +41759,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -36085,39 +38879,24 @@
+@@ -36088,39 +39496,24 @@
do
case $1 in
--*=*)
@@ -39517,7 +41805,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -36127,18 +38906,24 @@
+@@ -36130,18 +39523,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -39547,7 +41835,7 @@
esac
shift
-@@ -36154,155 +38939,167 @@
+@@ -36157,156 +39556,169 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -39698,9 +41986,10 @@
- "umbrello/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/Makefile" ;;
- "umbrello/umbrello/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/Makefile" ;;
- "umbrello/umbrello/autolayout/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/autolayout/Makefile" ;;
-- "umbrello/umbrello/classparser/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/classparser/Makefile" ;;
- "umbrello/umbrello/clipboard/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/clipboard/Makefile" ;;
- "umbrello/umbrello/codegenerators/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codegenerators/Makefile" ;;
+- "umbrello/umbrello/codeimport/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/Makefile" ;;
+- "umbrello/umbrello/codeimport/kdevcppparser/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/kdevcppparser/Makefile" ;;
- "umbrello/umbrello/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/dialogs/Makefile" ;;
- "umbrello/umbrello/headings/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/headings/Makefile" ;;
- "umbrello/umbrello/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/pics/Makefile" ;;
@@ -39822,10 +42111,12 @@
+ "umbrello/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/Makefile" ;;
+ "umbrello/umbrello/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/Makefile" ;;
+ "umbrello/umbrello/autolayout/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/autolayout/Makefile" ;;
-+ "umbrello/umbrello/classparser/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/classparser/Makefile" ;;
+ "umbrello/umbrello/clipboard/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/clipboard/Makefile" ;;
+ "umbrello/umbrello/codegenerators/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codegenerators/Makefile" ;;
++ "umbrello/umbrello/codeimport/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/Makefile" ;;
++ "umbrello/umbrello/codeimport/kdevcppparser/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/kdevcppparser/Makefile" ;;
+ "umbrello/umbrello/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/dialogs/Makefile" ;;
++ "umbrello/umbrello/docgenerators/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/docgenerators/Makefile" ;;
+ "umbrello/umbrello/headings/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/headings/Makefile" ;;
+ "umbrello/umbrello/pics/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/pics/Makefile" ;;
+ "umbrello/umbrello/refactoring/Makefile") CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/refactoring/Makefile" ;;
@@ -39844,7 +42135,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -36314,553 +39111,745 @@
+@@ -36318,553 +39730,751 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -40594,6 +42885,12 @@
+include_kioslave_svn_TRUE!$include_kioslave_svn_TRUE$ac_delim
+include_kioslave_svn_FALSE!$include_kioslave_svn_FALSE$ac_delim
+KMTRACE_LIBS!$KMTRACE_LIBS$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
+TOPSUBDIRS!$TOPSUBDIRS$ac_delim
+cervisia_SUBDIR_included_TRUE!$cervisia_SUBDIR_included_TRUE$ac_delim
+cervisia_SUBDIR_included_FALSE!$cervisia_SUBDIR_included_FALSE$ac_delim
@@ -40614,12 +42911,6 @@
+kioslave_SUBDIR_included_TRUE!$kioslave_SUBDIR_included_TRUE$ac_delim
+kioslave_SUBDIR_included_FALSE!$kioslave_SUBDIR_included_FALSE$ac_delim
+kmtrace_SUBDIR_included_TRUE!$kmtrace_SUBDIR_included_TRUE$ac_delim
-+kmtrace_SUBDIR_included_FALSE!$kmtrace_SUBDIR_included_FALSE$ac_delim
-+kompare_SUBDIR_included_TRUE!$kompare_SUBDIR_included_TRUE$ac_delim
-+kompare_SUBDIR_included_FALSE!$kompare_SUBDIR_included_FALSE$ac_delim
-+kprofilemethod_SUBDIR_included_TRUE!$kprofilemethod_SUBDIR_included_TRUE$ac_delim
-+kprofilemethod_SUBDIR_included_FALSE!$kprofilemethod_SUBDIR_included_FALSE$ac_delim
-+kspy_SUBDIR_included_TRUE!$kspy_SUBDIR_included_TRUE$ac_delim
_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -40661,6 +42952,12 @@
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++kmtrace_SUBDIR_included_FALSE!$kmtrace_SUBDIR_included_FALSE$ac_delim
++kompare_SUBDIR_included_TRUE!$kompare_SUBDIR_included_TRUE$ac_delim
++kompare_SUBDIR_included_FALSE!$kompare_SUBDIR_included_FALSE$ac_delim
++kprofilemethod_SUBDIR_included_TRUE!$kprofilemethod_SUBDIR_included_TRUE$ac_delim
++kprofilemethod_SUBDIR_included_FALSE!$kprofilemethod_SUBDIR_included_FALSE$ac_delim
++kspy_SUBDIR_included_TRUE!$kspy_SUBDIR_included_TRUE$ac_delim
+kspy_SUBDIR_included_FALSE!$kspy_SUBDIR_included_FALSE$ac_delim
+kstartperf_SUBDIR_included_TRUE!$kstartperf_SUBDIR_included_TRUE$ac_delim
+kstartperf_SUBDIR_included_FALSE!$kstartperf_SUBDIR_included_FALSE$ac_delim
@@ -40680,7 +42977,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -41082,7 +43379,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -36868,248 +39857,129 @@
+@@ -36872,248 +40482,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -41123,6 +43420,7 @@
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -41430,7 +43728,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -37120,135 +39990,39 @@
+@@ -37124,135 +40616,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -41592,7 +43890,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -37258,18 +40032,29 @@
+@@ -37262,18 +40658,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
@@ -41630,7 +43928,7 @@
else
continue
fi
-@@ -37291,53 +40076,79 @@
+@@ -37295,53 +40702,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -41739,17 +44037,139 @@
{ (exit 0); exit 0; }
_ACEOF
+--- configure.files
++++ configure.files
+@@ -9,3 +9,4 @@
+ ./kioslave/svn/configure.in.in
+ ./kmtrace/configure.in.in
+ ./umbrello/configure.in.in
++./umbrello/umbrello/docgenerators/configure.in.in
--- configure.in
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdesdk, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdesdk, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
+@@ -485,6 +487,106 @@
+ dnl #endif
+ dnl ])
+
++
++AC_LANG_SAVE
++AC_LANG_C
++
++AC_CHECK_HEADER(libxml2/libxml/xmlmemory.h,
++ [have_libxml2=yes],
++ [have_libxml2=no])
++
++if test "$have_libxml2" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++fi
++
++AC_CHECK_HEADER(libxslt/xslt.h,
++ [have_libxslt=yes],
++ [have_libxslt=no])
++
++if test "$have_libxslt" = "no"; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++fi
++
++AC_LANG_RESTORE
++
++
++dnl =======================================================
++dnl FILE: ./umbrello/umbrello/docgenerators/configure.in.in
++dnl =======================================================
++
++
++HAVE_XSLT=yes
++
++KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/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], [XMLLINT=""])
++ AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint])
++ else
++ AC_MSG_WARN([You need at least libxml 2.4.8])
++ HAVE_XSLT=no
++ fi
++fi
++
++if test "$HAVE_XSLT" = yes; then
++
++ KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/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)])
++ HAVE_XSLT=no
++ ])
++
++ 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])
++ HAVE_XSLT=no
++ fi
++ fi
++fi
++
++if test "$HAVE_XSLT" = no; then
++ DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
++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)
++
+ KDE_CREATE_SUBDIRSLIST
+ AM_CONDITIONAL(cervisia_SUBDIR_included, test "x$cervisia_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
+@@ -619,6 +721,7 @@
+ AC_CONFIG_FILES([ umbrello/umbrello/codeimport/Makefile ])
+ AC_CONFIG_FILES([ umbrello/umbrello/codeimport/kdevcppparser/Makefile ])
+ AC_CONFIG_FILES([ umbrello/umbrello/dialogs/Makefile ])
++AC_CONFIG_FILES([ umbrello/umbrello/docgenerators/Makefile ])
+ AC_CONFIG_FILES([ umbrello/umbrello/headings/Makefile ])
+ AC_CONFIG_FILES([ umbrello/umbrello/pics/Makefile ])
+ AC_CONFIG_FILES([ umbrello/umbrello/refactoring/Makefile ])
--- doc/cervisia/Makefile.in
+++ doc/cervisia/Makefile.in
@@ -94,6 +94,7 @@
@@ -41760,7 +44180,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -41770,7 +44203,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -41790,7 +44223,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -41809,7 +44242,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -41827,7 +44260,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -41836,7 +44269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41848,7 +44281,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -542,10 +551,10 @@
+@@ -542,10 +557,10 @@
.NOEXPORT:
#>+ 2
@@ -41861,7 +44294,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -572,20 +581,20 @@
+@@ -572,20 +587,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/cervisia
@@ -41895,7 +44328,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -41905,7 +44351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -41925,7 +44371,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -41944,7 +44390,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -41962,7 +44408,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -41971,7 +44417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41993,7 +44439,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42003,7 +44462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42023,7 +44482,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42042,7 +44501,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42060,7 +44519,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -358,7 +367,7 @@
+@@ -358,7 +373,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42069,7 +44528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -396,9 +405,9 @@
+@@ -396,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42081,7 +44540,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -543,10 +552,10 @@
+@@ -543,10 +558,10 @@
.NOEXPORT:
#>+ 2
@@ -42094,7 +44553,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -573,20 +582,20 @@
+@@ -573,20 +588,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbabel
@@ -42128,7 +44587,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42138,7 +44610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42158,7 +44630,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42177,7 +44649,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42195,7 +44667,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42204,7 +44676,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42226,7 +44698,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42236,7 +44721,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42256,7 +44741,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42275,7 +44760,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42293,7 +44778,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42302,7 +44787,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42324,7 +44809,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42334,7 +44832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42354,7 +44852,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42373,7 +44871,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42391,7 +44889,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42400,7 +44898,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42422,7 +44920,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42432,7 +44943,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42452,7 +44963,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42471,7 +44982,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42489,7 +45000,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -370,13 +379,13 @@
+@@ -370,13 +385,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -42505,7 +45016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -414,9 +423,9 @@
+@@ -414,9 +429,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42527,7 +45038,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42537,7 +45061,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42557,7 +45081,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42576,7 +45100,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42594,7 +45118,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42603,7 +45127,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42625,7 +45149,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42635,7 +45172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42655,7 +45192,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42674,7 +45211,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42692,7 +45229,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -376,7 +385,7 @@
+@@ -376,7 +391,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -42701,7 +45238,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -414,9 +423,9 @@
+@@ -414,9 +429,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42713,7 +45250,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -703,7 +712,7 @@
+@@ -703,7 +718,7 @@
.NOEXPORT:
#>+ 2
@@ -42732,7 +45269,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -42742,7 +45292,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -42762,7 +45312,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -42781,7 +45331,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -42799,7 +45349,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -42808,7 +45358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42820,7 +45370,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -542,10 +551,10 @@
+@@ -542,10 +557,10 @@
.NOEXPORT:
#>+ 2
@@ -42833,7 +45383,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -572,20 +581,20 @@
+@@ -572,20 +587,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/umbrello
@@ -51063,7 +53613,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +176,9 @@
+@@ -142,6 +145,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51073,7 +53636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +219,16 @@
+@@ -213,18 +225,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51093,7 +53656,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +249,18 @@
+@@ -245,14 +255,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51112,7 +53675,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +327,17 @@
+@@ -319,14 +333,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51130,7 +53693,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -355,7 +366,7 @@
+@@ -355,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51139,7 +53702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -393,9 +404,9 @@
+@@ -393,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51151,7 +53714,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -546,7 +557,7 @@
+@@ -546,7 +563,7 @@
.NOEXPORT:
#>+ 2
@@ -51232,7 +53795,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -200,6 +201,9 @@
+@@ -169,6 +170,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -200,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51242,7 +53818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -240,18 +244,16 @@
+@@ -240,18 +250,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51262,7 +53838,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -272,14 +274,18 @@
+@@ -272,14 +280,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51281,7 +53857,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -346,14 +352,17 @@
+@@ -346,14 +358,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51299,7 +53875,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -388,7 +397,7 @@
+@@ -388,7 +403,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -51308,7 +53884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -426,9 +435,9 @@
+@@ -426,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51330,7 +53906,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -184,6 +185,9 @@
+@@ -153,6 +154,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -184,6 +191,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51340,7 +53929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -224,18 +228,16 @@
+@@ -224,18 +234,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51360,7 +53949,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -256,14 +258,18 @@
+@@ -256,14 +264,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51379,7 +53968,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -330,14 +336,17 @@
+@@ -330,14 +342,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51397,7 +53986,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -368,7 +377,7 @@
+@@ -368,7 +383,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51406,7 +53995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -406,9 +415,9 @@
+@@ -406,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51428,7 +54017,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51438,7 +54040,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51458,7 +54060,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51477,7 +54079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51495,7 +54097,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -367,7 +376,7 @@
+@@ -367,7 +382,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51504,7 +54106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +414,9 @@
+@@ -405,9 +420,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51526,7 +54128,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -199,6 +200,9 @@
+@@ -168,6 +169,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -199,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51536,7 +54151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,18 +243,16 @@
+@@ -239,18 +249,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51556,7 +54171,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +273,18 @@
+@@ -271,14 +279,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51575,7 +54190,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +351,17 @@
+@@ -345,14 +357,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51593,7 +54208,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -390,7 +399,7 @@
+@@ -390,7 +405,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -51602,7 +54217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -428,9 +437,9 @@
+@@ -428,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51624,7 +54239,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51634,7 +54262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51654,7 +54282,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51673,7 +54301,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51691,7 +54319,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -369,7 +378,7 @@
+@@ -369,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51700,7 +54328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +416,9 @@
+@@ -407,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51722,7 +54350,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -199,6 +200,9 @@
+@@ -168,6 +169,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -199,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51732,7 +54373,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,18 +243,16 @@
+@@ -239,18 +249,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51752,7 +54393,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +273,18 @@
+@@ -271,14 +279,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51771,7 +54412,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +351,17 @@
+@@ -345,14 +357,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51789,7 +54430,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -391,7 +400,7 @@
+@@ -391,7 +406,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -51798,7 +54439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -429,9 +438,9 @@
+@@ -429,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51820,7 +54461,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51830,7 +54484,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51850,7 +54504,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51869,7 +54523,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51887,7 +54541,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -369,7 +378,7 @@
+@@ -369,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51896,7 +54550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +416,9 @@
+@@ -407,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51918,7 +54572,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -199,6 +200,9 @@
+@@ -168,6 +169,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -199,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51928,7 +54595,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,18 +243,16 @@
+@@ -239,18 +249,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51948,7 +54615,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +273,18 @@
+@@ -271,14 +279,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -51967,7 +54634,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +351,17 @@
+@@ -345,14 +357,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -51985,7 +54652,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -386,7 +395,7 @@
+@@ -386,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -51994,7 +54661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -424,9 +433,9 @@
+@@ -424,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52016,7 +54683,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52026,7 +54706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52046,7 +54726,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52065,7 +54745,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52083,7 +54763,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -367,7 +376,7 @@
+@@ -367,7 +382,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52092,7 +54772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +414,9 @@
+@@ -405,9 +420,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52114,7 +54794,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -205,6 +206,9 @@
+@@ -174,6 +175,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -205,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52124,7 +54817,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -245,18 +249,16 @@
+@@ -245,18 +255,16 @@
VERSION := `cat $(srcdir)/VERSION`
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52144,7 +54837,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -277,14 +279,18 @@
+@@ -277,14 +285,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52163,7 +54856,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -351,14 +357,17 @@
+@@ -351,14 +363,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52181,7 +54874,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -395,7 +404,7 @@
+@@ -395,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -52190,7 +54883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -433,9 +442,9 @@
+@@ -433,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52212,7 +54905,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52222,7 +54928,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52242,7 +54948,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52261,7 +54967,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52279,7 +54985,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -418,7 +427,7 @@
+@@ -418,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52288,7 +54994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +465,9 @@
+@@ -456,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52310,7 +55016,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52320,7 +55039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52340,7 +55059,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52359,7 +55078,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52377,7 +55096,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -373,7 +382,7 @@
+@@ -373,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -52386,7 +55105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +420,9 @@
+@@ -411,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52408,7 +55127,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52418,7 +55150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52438,7 +55170,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52457,7 +55189,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52475,7 +55207,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -410,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52484,7 +55216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -448,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52506,7 +55238,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52516,7 +55261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52536,7 +55281,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52555,7 +55300,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52573,7 +55318,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -361,7 +370,7 @@
+@@ -361,7 +376,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52582,7 +55327,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -399,9 +408,9 @@
+@@ -399,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52594,7 +55339,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -544,105 +553,105 @@
+@@ -544,105 +559,105 @@
.NOEXPORT:
#>+ 2
@@ -52778,7 +55523,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -210,6 +211,9 @@
+@@ -179,6 +180,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -210,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52788,7 +55546,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -250,18 +254,16 @@
+@@ -250,18 +260,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52808,7 +55566,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +284,18 @@
+@@ -282,14 +290,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52827,7 +55585,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +362,17 @@
+@@ -356,14 +368,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52845,7 +55603,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -402,7 +411,7 @@
+@@ -402,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52854,7 +55612,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +449,9 @@
+@@ -440,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52866,7 +55624,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -672,22 +681,22 @@
+@@ -672,22 +687,22 @@
.NOEXPORT:
#>+ 3
@@ -52896,7 +55654,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -734,7 +743,7 @@
+@@ -734,7 +749,7 @@
#>+ 11
@@ -52915,7 +55673,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -210,6 +211,9 @@
+@@ -179,6 +180,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -210,6 +217,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52925,7 +55696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -250,18 +254,16 @@
+@@ -250,18 +260,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52945,7 +55716,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +284,18 @@
+@@ -282,14 +290,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -52964,7 +55735,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +362,17 @@
+@@ -356,14 +368,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -52982,7 +55753,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -402,7 +411,7 @@
+@@ -402,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52991,7 +55762,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +449,9 @@
+@@ -440,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53013,7 +55784,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -253,6 +254,9 @@
+@@ -222,6 +223,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -253,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53023,7 +55807,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -293,18 +297,16 @@
+@@ -293,18 +303,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53043,7 +55827,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -325,14 +327,18 @@
+@@ -325,14 +333,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53062,7 +55846,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -399,14 +405,17 @@
+@@ -399,14 +411,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53080,7 +55864,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -493,7 +502,7 @@
+@@ -493,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53089,7 +55873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +540,9 @@
+@@ -531,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53101,7 +55885,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -981,18 +990,18 @@
+@@ -954,6 +969,11 @@
+
+ distclean-local:
+ rm -r -f API
++
++#>- catalogmanager.lo: ../common/version.h
++#>+ 1
++catalogmanager.lo: catalogmanager.moc ../common/version.h
++main.o: ../common/version.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -981,18 +1001,18 @@
mocs: findinfilesdialog.moc
#>+ 3
@@ -53126,7 +55922,7 @@
#>+ 3
multiroughtransdlg.moc: $(srcdir)/multiroughtransdlg.h
-@@ -1017,7 +1026,7 @@
+@@ -1017,7 +1037,7 @@
#>+ 3
clean-metasources:
@@ -53135,7 +55931,7 @@
#>+ 2
KDE_DIST=hi16-app-catalogmanager.png lo32-app-catalogmanager.png markpatterndialog.h validationoptions.ui validateprogresswidget.ui.h hi22-app-catalogmanager.png future.cpp markpatternwidget.ui catalogmanagerui.rc catalogmanager.desktop hi48-app-catalogmanager.png lo16-app-catalogmanager.png Makefile.in validateprogresswidget.ui validateprogress.h hi32-app-catalogmanager.png Makefile.am
-@@ -1043,26 +1052,26 @@
+@@ -1043,26 +1063,26 @@
#>+ 22
install-kde-icons:
@@ -53171,6 +55967,32 @@
#>+ 15
force-reedit:
+@@ -1103,7 +1123,7 @@
+
+
+ #>+ 11
+-libcatalogmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/catalogmanagerview.cpp $(srcdir)/catalogmanager.cpp $(srcdir)/findinfilesdialog.cpp $(srcdir)/catmanlistitem.cpp $(srcdir)/multiroughtransdlg.cpp $(srcdir)/validateprogress.cpp $(srcdir)/markpatterndialog.cpp catalogmanageriface_skel.cpp validationoptions.cpp validateprogresswidget.cpp markpatternwidget.cpp catalogmanagerview.moc validationoptions.moc findinfilesdialog.moc markpatterndialog.moc validateprogresswidget.moc multiroughtransdlg.moc markpatternwidget.moc validateprogress.moc catalogmanager.moc
++libcatalogmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/catalogmanagerview.cpp $(srcdir)/catalogmanager.cpp ../common/version.h $(srcdir)/findinfilesdialog.cpp $(srcdir)/catmanlistitem.cpp $(srcdir)/multiroughtransdlg.cpp $(srcdir)/validateprogress.cpp $(srcdir)/markpatterndialog.cpp catalogmanageriface_skel.cpp validationoptions.cpp validateprogresswidget.cpp markpatternwidget.cpp catalogmanagerview.moc validationoptions.moc findinfilesdialog.moc markpatterndialog.moc validateprogresswidget.moc multiroughtransdlg.moc markpatternwidget.moc validateprogress.moc catalogmanager.moc
+ @echo 'creating libcatalogmanager_la.all_cpp.cpp ...'; \
+ rm -f libcatalogmanager_la.all_cpp.files libcatalogmanager_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libcatalogmanager_la.all_cpp.final; \
+@@ -1138,7 +1158,7 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 22
++#>+ 21
+ multiroughtransdlg.lo: multiroughtransdlg.moc
+ $(srcdir)/multiroughtransdlg.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h
+ catalogmanagerview.lo: catalogmanagerview.moc
+@@ -1153,7 +1173,6 @@
+ $(srcdir)/catalogmanagerview.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h
+ findinfilesdialog.lo: findinfilesdialog.moc
+ $(srcdir)/markpatterndialog.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h
+-catalogmanager.lo: catalogmanager.moc
+ markpatterndialog.o: markpatterndialog.moc
+ catalogmanager.o: catalogmanager.moc
+ validateprogress.lo: validateprogress.moc
--- kbabel/common/libgettext/Makefile.in
+++ kbabel/common/libgettext/Makefile.in
@@ -132,6 +132,7 @@
@@ -53181,7 +56003,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -211,6 +212,9 @@
+@@ -180,6 +181,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -211,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53191,7 +56026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -251,18 +255,16 @@
+@@ -251,18 +261,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53211,7 +56046,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -283,14 +285,18 @@
+@@ -283,14 +291,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53230,7 +56065,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -357,14 +363,17 @@
+@@ -357,14 +369,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53248,7 +56083,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -398,7 +407,7 @@
+@@ -398,7 +413,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -53257,7 +56092,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +445,9 @@
+@@ -436,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53279,7 +56114,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -247,6 +248,9 @@
+@@ -216,6 +217,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -247,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53289,7 +56137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -287,18 +291,16 @@
+@@ -287,18 +297,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53309,7 +56157,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -319,14 +321,18 @@
+@@ -319,14 +327,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53328,7 +56176,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -393,14 +399,17 @@
+@@ -393,14 +405,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53346,7 +56194,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -491,7 +500,7 @@
+@@ -491,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53355,7 +56203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -529,9 +538,9 @@
+@@ -529,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53367,7 +56215,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1012,18 +1021,18 @@
+@@ -1012,18 +1027,18 @@
mocs: kbproject.moc
#>+ 3
@@ -53392,7 +56240,7 @@
#>+ 3
catalog.moc: $(srcdir)/catalog.h
-@@ -1041,7 +1050,7 @@
+@@ -1041,7 +1056,7 @@
#>+ 3
clean-metasources:
@@ -53411,7 +56259,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -227,6 +228,9 @@
+@@ -196,6 +197,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -227,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53421,7 +56282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -267,18 +271,16 @@
+@@ -267,18 +277,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53441,7 +56302,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -299,14 +301,18 @@
+@@ -299,14 +307,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53460,7 +56321,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -373,14 +379,17 @@
+@@ -373,14 +385,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53478,7 +56339,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -456,7 +465,7 @@
+@@ -456,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53487,7 +56348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +503,9 @@
+@@ -494,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53499,7 +56360,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -783,13 +792,6 @@
+@@ -750,6 +765,16 @@
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-kde_servicetypesDATA
+
++
++#>- context.lo: ../common/kbprojectsettings.h
++#>+ 1
++context.lo: context.moc ../common/kbprojectsettings.h
++#>- projectpref.lo: ../common/kbprojectsettings.h
++#>+ 1
++projectpref.lo: projectpref.moc ../common/kbprojectsettings.h
++#>- projectprefwidgets.lo: ../common/kbprojectsettings.h
++#>+ 1
++projectprefwidgets.lo: projectprefwidgets.moc ../common/kbprojectsettings.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -783,13 +808,6 @@
mocs: kactionselector.moc
#>+ 3
@@ -53513,7 +56391,7 @@
toolaction.moc: $(srcdir)/toolaction.h
$(MOC) $(srcdir)/toolaction.h -o toolaction.moc
-@@ -804,6 +806,13 @@
+@@ -804,6 +822,13 @@
mocs: context.moc
#>+ 3
@@ -53527,7 +56405,7 @@
projectwizard.moc: $(srcdir)/projectwizard.h
$(MOC) $(srcdir)/projectwizard.h -o projectwizard.moc
-@@ -826,7 +835,7 @@
+@@ -826,7 +851,7 @@
#>+ 3
clean-metasources:
@@ -53536,15 +56414,44 @@
#>+ 2
KDE_DIST=klisteditor.ui.h diffpreferences.ui projectwizardwidget.ui klisteditor.ui toolselectionwidget.h projectwizardwidget.ui.h kbabel_tool.desktop diffpreferences.ui.h Makefile.in kbabel_validator.desktop toolaction.h Makefile.am projectwizardwidget2.ui
-@@ -881,7 +890,7 @@
+@@ -881,7 +906,7 @@
#>+ 11
-libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp $(srcdir)/projectpref.cpp $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc context.moc toolaction.moc projectprefwidgets.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc
-+libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp $(srcdir)/projectpref.cpp $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc projectprefwidgets.moc context.moc toolaction.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc
++libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp ../common/kbprojectsettings.h $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp ../common/kbprojectsettings.h $(srcdir)/projectpref.cpp ../common/kbprojectsettings.h $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc projectprefwidgets.moc context.moc toolaction.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc
@echo 'creating libkbabelcommonui_la.all_cpp.cpp ...'; \
rm -f libkbabelcommonui_la.all_cpp.files libkbabelcommonui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkbabelcommonui_la.all_cpp.final; \
+@@ -916,19 +941,17 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 33
++#>+ 30
+ roughtransdlg.o: roughtransdlg.moc
+ roughtransdlg.lo: roughtransdlg.moc
+ kactionselector.o: kactionselector.moc
+ $(srcdir)/projectwizard.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+ $(srcdir)/roughtransdlg.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+-projectprefwidgets.lo: projectprefwidgets.moc
+ $(srcdir)/projectprefwidgets.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+ $(srcdir)/projectpref.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+ cmdedit.lo: cmdedit.moc
+ nmcheck-am: nmcheck
+ toolselectionwidget.lo: toolselectionwidget.moc
+-context.lo: context.moc
+ kactionselector.lo: kactionselector.moc
+ projectwizard.o: projectwizard.moc
+ toolaction.lo: toolaction.moc
+@@ -946,7 +969,6 @@
+ $(srcdir)/cmdedit.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+ projectprefwidgets.o: projectprefwidgets.moc
+ toolselectionwidget.o: toolselectionwidget.moc
+-projectpref.lo: projectpref.moc
+ cmdedit.o: cmdedit.moc
+ $(srcdir)/finddialog.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h
+
--- kbabel/datatools/accelerators/Makefile.in
+++ kbabel/datatools/accelerators/Makefile.in
@@ -141,6 +141,7 @@
@@ -53555,7 +56462,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53565,7 +56485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53585,7 +56505,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53604,7 +56524,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53622,7 +56542,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -53631,7 +56551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53653,7 +56573,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53663,7 +56596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53683,7 +56616,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53702,7 +56635,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53720,7 +56653,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -53729,7 +56662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53751,7 +56684,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53761,7 +56707,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53781,7 +56727,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53800,7 +56746,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53818,7 +56764,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -53827,7 +56773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53849,7 +56795,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,6 +222,9 @@
+@@ -190,6 +191,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -221,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53859,7 +56818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,18 +265,16 @@
+@@ -261,18 +271,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53879,7 +56838,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +295,18 @@
+@@ -293,14 +301,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53898,7 +56857,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +373,17 @@
+@@ -367,14 +379,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -53916,7 +56875,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -53925,7 +56884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53947,7 +56906,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53957,7 +56929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53977,7 +56949,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -53996,7 +56968,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54014,7 +56986,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54023,7 +56995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54045,7 +57017,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54055,7 +57040,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54075,7 +57060,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54094,7 +57079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54112,7 +57097,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -398,7 +407,7 @@
+@@ -398,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -54121,7 +57106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +445,9 @@
+@@ -436,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54143,7 +57128,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,6 +222,9 @@
+@@ -190,6 +191,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -221,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54153,7 +57151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,18 +265,16 @@
+@@ -261,18 +271,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54173,7 +57171,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +295,18 @@
+@@ -293,14 +301,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54192,7 +57190,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +373,17 @@
+@@ -367,14 +379,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54210,7 +57208,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54219,7 +57217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54241,7 +57239,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54251,7 +57262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54271,7 +57282,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54290,7 +57301,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54308,7 +57319,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54317,7 +57328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54339,7 +57350,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,6 +222,9 @@
+@@ -190,6 +191,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -221,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54349,7 +57373,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,18 +265,16 @@
+@@ -261,18 +271,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54369,7 +57393,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +295,18 @@
+@@ -293,14 +301,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54388,7 +57412,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +373,17 @@
+@@ -367,14 +379,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54406,7 +57430,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54415,7 +57439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54437,7 +57461,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,6 +222,9 @@
+@@ -190,6 +191,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -221,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54447,7 +57484,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,18 +265,16 @@
+@@ -261,18 +271,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54467,7 +57504,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +295,18 @@
+@@ -293,14 +301,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54486,7 +57523,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +373,17 @@
+@@ -367,14 +379,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54504,7 +57541,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -419,7 +428,7 @@
+@@ -419,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54513,7 +57550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +466,9 @@
+@@ -457,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54535,7 +57572,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54545,7 +57595,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54565,7 +57615,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54584,7 +57634,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54602,7 +57652,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -414,7 +429,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54611,7 +57661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -452,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54633,7 +57683,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,6 +222,9 @@
+@@ -190,6 +191,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -221,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54643,7 +57706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -261,18 +265,16 @@
+@@ -261,18 +271,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54663,7 +57726,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +295,18 @@
+@@ -293,14 +301,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54682,7 +57745,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +373,17 @@
+@@ -367,14 +379,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54700,7 +57763,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54709,7 +57772,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54731,7 +57794,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54741,7 +57817,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54761,7 +57837,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54780,7 +57856,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54798,7 +57874,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -54807,7 +57883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54829,7 +57905,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -228,6 +229,9 @@
+@@ -197,6 +198,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -228,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54839,7 +57928,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -268,18 +272,16 @@
+@@ -268,18 +278,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54859,7 +57948,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +302,18 @@
+@@ -300,14 +308,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54878,7 +57967,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +380,17 @@
+@@ -374,14 +386,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54896,7 +57985,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -422,7 +437,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -54905,7 +57994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -460,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54917,6 +58006,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -740,6 +755,8 @@
+ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ uninstall-serviceDATA
+
++
++gettextexport.lo: ../../common/kbprojectsettings.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
--- kbabel/filters/linguist/Makefile.in
+++ kbabel/filters/linguist/Makefile.in
@@ -149,6 +149,7 @@
@@ -54927,7 +58025,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -228,6 +229,9 @@
+@@ -197,6 +198,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -228,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54937,7 +58048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -268,18 +272,16 @@
+@@ -268,18 +278,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54957,7 +58068,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +302,18 @@
+@@ -300,14 +308,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -54976,7 +58087,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +380,17 @@
+@@ -374,14 +386,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -54994,7 +58105,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -422,7 +437,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55003,7 +58114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -460,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55025,7 +58136,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55035,7 +58159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55055,7 +58179,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -55074,7 +58198,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -55092,7 +58216,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -372,7 +381,7 @@
+@@ -372,7 +387,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -55101,7 +58225,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +419,9 @@
+@@ -410,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55123,7 +58247,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -224,6 +225,9 @@
+@@ -193,6 +194,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -224,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55133,7 +58270,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -264,18 +268,16 @@
+@@ -264,18 +274,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55153,7 +58290,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -296,14 +298,18 @@
+@@ -296,14 +304,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -55172,7 +58309,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -370,14 +376,17 @@
+@@ -370,14 +382,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -55190,7 +58327,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -418,7 +427,7 @@
+@@ -418,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55199,7 +58336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +465,9 @@
+@@ -456,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55221,7 +58358,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55231,7 +58381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55251,7 +58401,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -55270,7 +58420,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -55288,7 +58438,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -361,7 +370,7 @@
+@@ -361,7 +376,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -55297,7 +58447,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -399,9 +408,9 @@
+@@ -399,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55309,7 +58459,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -544,7 +553,7 @@
+@@ -544,7 +559,7 @@
.NOEXPORT:
#>+ 2
@@ -55318,7 +58468,7 @@
#>+ 2
docs-am:
-@@ -552,198 +561,198 @@
+@@ -552,198 +567,198 @@
#>+ 195
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions
@@ -55685,7 +58835,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -262,6 +263,9 @@
+@@ -231,6 +232,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -262,6 +269,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55695,7 +58858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,18 +306,16 @@
+@@ -302,18 +312,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55715,7 +58878,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,14 +336,18 @@
+@@ -334,14 +342,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -55734,7 +58897,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -408,14 +414,17 @@
+@@ -408,14 +420,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -55752,7 +58915,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -540,7 +549,7 @@
+@@ -540,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55761,7 +58924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +587,9 @@
+@@ -578,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55773,7 +58936,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1170,32 +1179,32 @@
+@@ -1054,6 +1069,15 @@
+ rm -r -f API
+
+ # this is where the kdelnk file will go
++
++#>- kbabel.lo: ../common/kbprojectsettings.h ../common/version.h
++#>+ 1
++kbabel.lo: kbabel.moc ../common/kbprojectsettings.h ../common/version.h
++#>- kbabelview.lo: ../common/kbprojectsettings.h ../common/version.h
++#>+ 1
++kbabelview.lo: kbabelview.moc ../common/kbprojectsettings.h ../common/version.h
++kbabelview2.lo: ../common/kbprojectsettings.h
++main.o: ../common/version.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -1170,32 +1194,32 @@
mocs: kbcataloglistview.moc
#>+ 3
@@ -55818,7 +58997,7 @@
#>+ 3
kbabelsplash.moc: $(srcdir)/kbabelsplash.h
-@@ -1206,10 +1215,10 @@
+@@ -1206,10 +1230,10 @@
#>+ 3
clean-metasources:
@@ -55831,7 +59010,7 @@
#>+ 4
clean-idl:
-@@ -1237,23 +1246,23 @@
+@@ -1237,23 +1261,23 @@
#>+ 19
install-kde-icons:
@@ -55864,16 +59043,41 @@
#>+ 15
force-reedit:
-@@ -1294,7 +1303,7 @@
+@@ -1294,7 +1318,7 @@
#>+ 11
-libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp $(srcdir)/kbabelview2.cpp $(srcdir)/kbabel.cpp $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbabelview.moc kbabelpref.moc kbcatalog.moc taglistview.moc kbabelsplash.moc colorpreferences.moc
-+libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp $(srcdir)/kbabelview2.cpp $(srcdir)/kbabel.cpp $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbcatalog.moc taglistview.moc kbabelview.moc kbabelpref.moc kbabelsplash.moc colorpreferences.moc
++libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelview2.cpp ../common/kbprojectsettings.h $(srcdir)/kbabel.cpp ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbcatalog.moc taglistview.moc kbabelview.moc kbabelpref.moc kbabelsplash.moc colorpreferences.moc
@echo 'creating libkbabel_la.all_cpp.cpp ...'; \
rm -f libkbabel_la.all_cpp.files libkbabel_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkbabel_la.all_cpp.final; \
-@@ -1376,8 +1385,8 @@
+@@ -1329,7 +1353,7 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 65
++#>+ 63
+ errorlistview.lo: errorlistview.moc
+ kbcatalogview.o: kbcatalogview.moc
+ kbcataloglistview.o: kbcataloglistview.moc
+@@ -1347,7 +1371,6 @@
+ charselectview.lo: charselectview.moc
+ $(srcdir)/charselectview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+ $(srcdir)/gotodialog.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+-kbabel.lo: kbabel.moc
+ spelldlg.o: spelldlg.moc
+ $(srcdir)/spelldlg.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+ $(srcdir)/kbabelpref.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+@@ -1363,7 +1386,6 @@
+ contextview.lo: contextview.moc
+ contextview.o: contextview.moc
+ kbhighlighting.o: kbhighlighting.moc
+-kbabelview.lo: kbabelview.moc
+ $(srcdir)/contextview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+ $(srcdir)/kbabelview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
+ kbcatalog.o: kbcatalog.moc
+@@ -1376,8 +1398,8 @@
kbabel.o: kbabel.moc
headereditor.lo: headereditor.moc
$(srcdir)/sourceview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h
@@ -55893,7 +59097,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55903,7 +59120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55923,7 +59140,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -55942,7 +59159,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -55960,7 +59177,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -373,7 +382,7 @@
+@@ -373,7 +388,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -55969,7 +59186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +420,9 @@
+@@ -411,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55991,7 +59208,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -257,6 +258,9 @@
+@@ -226,6 +227,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -257,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56001,7 +59231,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -297,18 +301,16 @@
+@@ -297,18 +307,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56021,7 +59251,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -329,14 +331,18 @@
+@@ -329,14 +337,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56040,7 +59270,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -403,14 +409,17 @@
+@@ -403,14 +415,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56058,7 +59288,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -488,7 +497,7 @@
+@@ -488,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56067,7 +59297,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +535,9 @@
+@@ -526,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56079,9 +59309,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1029,6 +1038,13 @@
+@@ -1009,6 +1024,11 @@
+ rm -r -f API
+ # this is where the kdelnk file will go
++
++#>- kbabeldictbox.lo: ../common/version.h
++#>+ 1
++kbabeldictbox.lo: kbabeldictbox.moc ../common/version.h
++main.o: ../common/version.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -1029,6 +1049,13 @@
+
#>+ 3
+kbabeldictview.moc: $(srcdir)/kbabeldictview.h
+ $(MOC) $(srcdir)/kbabeldictview.h -o kbabeldictview.moc
@@ -56093,7 +59335,7 @@
aboutmoduledlg.moc: $(srcdir)/aboutmoduledlg.h
$(MOC) $(srcdir)/aboutmoduledlg.h -o aboutmoduledlg.moc
-@@ -1050,13 +1066,6 @@
+@@ -1050,13 +1077,6 @@
mocs: kbabeldict.moc
#>+ 3
@@ -56107,7 +59349,7 @@
kbabeldictbox.moc: $(srcdir)/kbabeldictbox.h
$(MOC) $(srcdir)/kbabeldictbox.h -o kbabeldictbox.moc
-@@ -1064,18 +1073,18 @@
+@@ -1064,18 +1084,18 @@
mocs: kbabeldictbox.moc
#>+ 3
@@ -56132,7 +59374,7 @@
#>+ 3
kbabelsplash.moc: $(srcdir)/kbabelsplash.h
-@@ -1086,7 +1095,7 @@
+@@ -1086,7 +1106,7 @@
#>+ 3
clean-metasources:
@@ -56141,7 +59383,7 @@
#>+ 2
KDE_DIST=hi16-app-kbabeldict.png kbabeldict.desktop kbabeldict_module.desktop hi48-app-kbabeldict.png lo16-app-kbabeldict.png README.modules Makefile.in lo32-app-kbabeldict.png hi32-app-kbabeldict.png Makefile.am
-@@ -1107,21 +1116,21 @@
+@@ -1107,21 +1127,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png
@@ -56169,6 +59411,20 @@
#>+ 15
force-reedit:
+@@ -1181,7 +1201,7 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 19
++#>+ 18
+ dictionarymenu.lo: dictionarymenu.moc
+ dictionarymenu.o: dictionarymenu.moc
+ kbabeldict.o: kbabeldict.moc
+@@ -1199,4 +1219,3 @@
+ aboutmoduledlg.o: aboutmoduledlg.moc
+ dictchooser.lo: dictchooser.moc
+ kbabeldictview.lo: kbabeldictview.moc
+-kbabeldictbox.lo: kbabeldictbox.moc
--- kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
+++ kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
@@ -153,6 +153,7 @@
@@ -56179,7 +59435,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -232,6 +233,9 @@
+@@ -201,6 +202,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -232,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56189,7 +59458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,18 +276,16 @@
+@@ -272,18 +282,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56209,7 +59478,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +306,18 @@
+@@ -304,14 +312,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56228,7 +59497,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +384,17 @@
+@@ -378,14 +390,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56246,7 +59515,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -448,7 +457,7 @@
+@@ -448,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56255,7 +59524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +495,9 @@
+@@ -486,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56267,7 +59536,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -819,7 +828,7 @@
+@@ -819,7 +834,7 @@
-rm -f database.moc dbse_factory.moc dbscan.moc KDBSearchEngine.moc preferenceswidget.moc
#>+ 2
@@ -56286,7 +59555,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -235,6 +236,9 @@
+@@ -204,6 +205,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -235,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56296,7 +59578,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,18 +279,16 @@
+@@ -275,18 +285,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56316,7 +59598,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -307,14 +309,18 @@
+@@ -307,14 +315,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56335,7 +59617,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -381,14 +387,17 @@
+@@ -381,14 +393,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56353,7 +59635,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -445,7 +454,7 @@
+@@ -445,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56362,7 +59644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +492,9 @@
+@@ -483,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56374,7 +59656,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -780,18 +789,18 @@
+@@ -780,18 +795,18 @@
#>+ 3
@@ -56399,7 +59681,7 @@
#>+ 3
dbscan.moc: $(srcdir)/dbscan.h
-@@ -801,25 +810,25 @@
+@@ -801,25 +816,25 @@
mocs: dbscan.moc
#>+ 3
@@ -56433,7 +59715,7 @@
#>+ 5
clean-ui:
-@@ -873,7 +882,7 @@
+@@ -873,7 +888,7 @@
#>+ 11
@@ -56452,7 +59734,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56462,7 +59757,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56482,7 +59777,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56501,7 +59796,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56519,7 +59814,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -373,7 +382,7 @@
+@@ -373,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -56528,7 +59823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +420,9 @@
+@@ -411,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56550,7 +59845,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -231,6 +232,9 @@
+@@ -200,6 +201,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -231,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56560,7 +59868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -271,18 +275,16 @@
+@@ -271,18 +281,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56580,7 +59888,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -303,14 +305,18 @@
+@@ -303,14 +311,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56599,7 +59907,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -377,14 +383,17 @@
+@@ -377,14 +389,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56617,7 +59925,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -443,7 +452,7 @@
+@@ -443,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56626,7 +59934,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +490,9 @@
+@@ -481,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56648,7 +59956,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -232,6 +233,9 @@
+@@ -201,6 +202,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -232,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56658,7 +59979,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,18 +276,16 @@
+@@ -272,18 +282,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56678,7 +59999,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +306,18 @@
+@@ -304,14 +312,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56697,7 +60018,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +384,17 @@
+@@ -378,14 +390,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56715,7 +60036,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -448,7 +457,7 @@
+@@ -448,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56724,7 +60045,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +495,9 @@
+@@ -486,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56736,7 +60057,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -779,13 +788,6 @@
+@@ -779,13 +794,6 @@
#>+ 3
@@ -56750,7 +60071,7 @@
compendiumdata.moc: $(srcdir)/compendiumdata.h
$(MOC) $(srcdir)/compendiumdata.h -o compendiumdata.moc
-@@ -793,11 +795,11 @@
+@@ -793,11 +801,11 @@
mocs: compendiumdata.moc
#>+ 3
@@ -56765,7 +60086,7 @@
#>+ 3
pocompendium.moc: $(srcdir)/pocompendium.h
-@@ -807,8 +809,15 @@
+@@ -807,8 +815,15 @@
mocs: pocompendium.moc
#>+ 3
@@ -56782,7 +60103,7 @@
#>+ 2
KDE_DIST=pwidget.ui Makefile.in pocompendium.desktop Makefile.am
-@@ -864,7 +873,7 @@
+@@ -864,7 +879,7 @@
#>+ 11
@@ -56801,7 +60122,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -232,6 +233,9 @@
+@@ -201,6 +202,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -232,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56811,7 +60145,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,18 +276,16 @@
+@@ -272,18 +282,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56831,7 +60165,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +306,18 @@
+@@ -304,14 +312,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56850,7 +60184,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +384,17 @@
+@@ -378,14 +390,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56868,7 +60202,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -444,7 +453,7 @@
+@@ -444,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56877,7 +60211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +491,9 @@
+@@ -482,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56899,7 +60233,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,9 @@
+@@ -159,6 +160,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -190,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56909,7 +60256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -230,18 +234,16 @@
+@@ -230,18 +240,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56929,7 +60276,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +264,18 @@
+@@ -262,14 +270,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -56948,7 +60295,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +342,17 @@
+@@ -336,14 +348,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -56966,7 +60313,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -374,7 +383,7 @@
+@@ -374,7 +389,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -56975,7 +60322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -412,9 +421,9 @@
+@@ -412,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56997,7 +60344,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -214,6 +215,9 @@
+@@ -183,6 +184,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -214,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57007,7 +60367,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -254,18 +258,16 @@
+@@ -254,18 +264,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57027,7 +60387,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -286,14 +288,18 @@
+@@ -286,14 +294,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57046,7 +60406,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -360,14 +366,17 @@
+@@ -360,14 +372,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57064,7 +60424,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -410,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57073,7 +60433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -448,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57085,7 +60445,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -699,13 +708,6 @@
+@@ -699,13 +714,6 @@
.NOEXPORT:
#>+ 3
@@ -57099,7 +60459,7 @@
packagelistjob.moc: $(srcdir)/packagelistjob.h
$(MOC) $(srcdir)/packagelistjob.h -o packagelistjob.moc
-@@ -720,13 +722,6 @@
+@@ -720,13 +728,6 @@
mocs: smtp.moc
#>+ 3
@@ -57113,7 +60473,7 @@
bugdetailsjob.moc: $(srcdir)/bugdetailsjob.h
$(MOC) $(srcdir)/bugdetailsjob.h -o bugdetailsjob.moc
-@@ -734,13 +729,6 @@
+@@ -734,13 +735,6 @@
mocs: bugdetailsjob.moc
#>+ 3
@@ -57127,7 +60487,7 @@
bugmybugsjob.moc: $(srcdir)/bugmybugsjob.h
$(MOC) $(srcdir)/bugmybugsjob.h -o bugmybugsjob.moc
-@@ -755,11 +743,32 @@
+@@ -755,11 +749,32 @@
mocs: buglistjob.moc
#>+ 3
@@ -57162,7 +60522,7 @@
#>+ 2
docs-am:
-@@ -803,7 +812,7 @@
+@@ -803,7 +818,7 @@
#>+ 11
@@ -57171,7 +60531,7 @@
@echo 'creating libkbbbackend_la.all_cpp.cpp ...'; \
rm -f libkbbbackend_la.all_cpp.files libkbbbackend_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkbbbackend_la.all_cpp.final; \
-@@ -841,8 +850,8 @@
+@@ -841,8 +856,8 @@
#>+ 19
buglistjob.o: buglistjob.moc
bugmybugsjob.o: bugmybugsjob.moc
@@ -57181,7 +60541,7 @@
bugdetailsjob.lo: bugdetailsjob.moc
buglistjob.lo: buglistjob.moc
bugdetailsjob.o: bugdetailsjob.moc
-@@ -854,6 +863,6 @@
+@@ -854,6 +869,6 @@
nmcheck-am: nmcheck
smtp.lo: smtp.moc
bugjob.lo: bugjob.moc
@@ -57199,7 +60559,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -226,6 +227,9 @@
+@@ -195,6 +196,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -226,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57209,7 +60582,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -266,18 +270,16 @@
+@@ -266,18 +276,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57229,7 +60602,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,14 +300,18 @@
+@@ -298,14 +306,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57248,7 +60621,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -372,14 +378,17 @@
+@@ -372,14 +384,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57266,7 +60639,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -441,7 +450,7 @@
+@@ -441,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57275,7 +60648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +488,9 @@
+@@ -479,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57287,7 +60660,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -801,6 +810,13 @@
+@@ -801,6 +816,13 @@
mocs: loadallbugsdlg.moc
#>+ 3
@@ -57301,7 +60674,7 @@
preferencesdialog.moc: $(srcdir)/preferencesdialog.h
$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
-@@ -815,13 +831,6 @@
+@@ -815,13 +837,6 @@
mocs: messageeditor.moc
#>+ 3
@@ -57315,7 +60688,7 @@
cwbuglistcontainer.moc: $(srcdir)/cwbuglistcontainer.h
$(MOC) $(srcdir)/cwbuglistcontainer.h -o cwbuglistcontainer.moc
-@@ -844,7 +853,7 @@
+@@ -844,7 +859,7 @@
#>+ 3
clean-metasources:
@@ -57324,7 +60697,7 @@
#>+ 2
KDE_DIST=packageselectdialog.h preferencesdialog.h messageeditor.h msginputdialog.h cwsearchwidget_base.ui cwsearchwidget.h cwbugdetailscontainer.h buglvi.h severityselectdialog.h serverconfigdialog.h packagelvi.h cwbugdetailscontainer_base.ui kbbmainwindow.h kbbbookmarkmanager.h Makefile.in cwbuglistcontainer.h centralwidget_base.ui cwloadingwidget.h cwbugdetails.h loadallbugsdlg.h centralwidget.h Makefile.am
-@@ -898,7 +907,7 @@
+@@ -898,7 +913,7 @@
#>+ 11
@@ -57343,7 +60716,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -220,6 +221,9 @@
+@@ -189,6 +190,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -220,6 +227,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57353,7 +60739,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -260,18 +264,16 @@
+@@ -260,18 +270,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57373,7 +60759,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +294,18 @@
+@@ -292,14 +300,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57392,7 +60778,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +372,17 @@
+@@ -366,14 +378,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57410,7 +60796,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -416,7 +425,7 @@
+@@ -416,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57419,7 +60805,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +463,9 @@
+@@ -454,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57441,7 +60827,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -233,6 +234,9 @@
+@@ -202,6 +203,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -233,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57451,7 +60850,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,18 +277,16 @@
+@@ -273,18 +283,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57471,7 +60870,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,14 +307,18 @@
+@@ -305,14 +313,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57490,7 +60889,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -379,14 +385,17 @@
+@@ -379,14 +391,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57508,7 +60907,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -428,7 +437,7 @@
+@@ -428,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57517,7 +60916,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +475,9 @@
+@@ -466,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57529,7 +60928,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -852,7 +861,7 @@
+@@ -852,7 +867,7 @@
.NOEXPORT:
#>+ 2
@@ -57538,7 +60937,7 @@
#>+ 2
docs-am:
-@@ -861,29 +870,29 @@
+@@ -861,29 +876,29 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
$(INSTALL_DATA) $(srcdir)/hi22-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png
@@ -57587,7 +60986,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57597,7 +61009,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57617,7 +61029,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57636,7 +61048,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57654,7 +61066,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -368,7 +377,7 @@
+@@ -368,7 +383,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -57663,7 +61075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -406,9 +415,9 @@
+@@ -406,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57685,7 +61097,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,6 +178,9 @@
+@@ -146,6 +147,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -177,6 +184,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57695,7 +61120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -217,18 +221,16 @@
+@@ -217,18 +227,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57715,7 +61140,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -249,14 +251,18 @@
+@@ -249,14 +257,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57734,7 +61159,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -323,14 +329,17 @@
+@@ -323,14 +335,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57752,7 +61177,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -362,7 +371,7 @@
+@@ -362,7 +377,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -57761,7 +61186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -400,9 +409,9 @@
+@@ -400,9 +415,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57783,7 +61208,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -254,6 +255,9 @@
+@@ -223,6 +224,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -254,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57793,7 +61231,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -294,18 +298,16 @@
+@@ -294,18 +304,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57813,7 +61251,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -326,14 +328,18 @@
+@@ -326,14 +334,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57832,7 +61270,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -400,14 +406,17 @@
+@@ -400,14 +412,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57850,7 +61288,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -500,7 +509,7 @@
+@@ -500,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57859,7 +61297,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +547,9 @@
+@@ -538,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57871,7 +61309,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1054,7 +1063,7 @@
+@@ -1054,7 +1069,7 @@
-rm -f coverageview.moc multiview.moc instrview.moc callgraphview.moc dumpselection.moc partgraph.moc sourceview.moc configdlg.moc functionselection.moc stackselection.moc treemap.moc callview.moc costtypeview.moc toplevel.moc partview.moc loader.moc callmapview.moc partselection.moc tabview.moc
#>+ 2
@@ -57890,7 +61328,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -192,6 +193,9 @@
+@@ -161,6 +162,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -192,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57900,7 +61351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -232,18 +236,16 @@
+@@ -232,18 +242,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57920,7 +61371,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -264,14 +266,18 @@
+@@ -264,14 +272,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -57939,7 +61390,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -338,14 +344,17 @@
+@@ -338,14 +350,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -57957,7 +61408,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -379,7 +388,7 @@
+@@ -379,7 +394,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -57966,7 +61417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -417,9 +426,9 @@
+@@ -417,9 +432,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57988,7 +61439,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57998,7 +61462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58018,7 +61482,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58037,7 +61501,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58055,7 +61519,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -357,7 +366,7 @@
+@@ -357,7 +372,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -58064,7 +61528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -395,9 +404,9 @@
+@@ -395,9 +410,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58076,7 +61540,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -549,21 +558,21 @@
+@@ -549,21 +564,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions
$(INSTALL_DATA) $(srcdir)/hi16-action-torec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png
@@ -58113,7 +61577,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58123,7 +61600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58143,7 +61620,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58162,7 +61639,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58180,7 +61657,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -374,7 +383,7 @@
+@@ -374,7 +389,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -58189,7 +61666,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -412,9 +421,9 @@
+@@ -412,9 +427,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58211,7 +61688,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58221,7 +61711,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58241,7 +61731,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58260,7 +61750,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58278,7 +61768,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -413,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58287,7 +61777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -451,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58309,7 +61799,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,6 +220,9 @@
+@@ -188,6 +189,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -219,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58319,7 +61822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,18 +263,16 @@
+@@ -259,18 +269,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58339,7 +61842,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +293,18 @@
+@@ -291,14 +299,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58358,7 +61861,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +371,17 @@
+@@ -365,14 +377,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58376,7 +61879,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58385,7 +61888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58407,7 +61910,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,6 +220,9 @@
+@@ -188,6 +189,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -219,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58417,7 +61933,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,18 +263,16 @@
+@@ -259,18 +269,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58437,7 +61953,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +293,18 @@
+@@ -291,14 +299,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58456,7 +61972,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +371,17 @@
+@@ -365,14 +377,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58474,7 +61990,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -417,7 +426,7 @@
+@@ -417,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58483,7 +61999,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +464,9 @@
+@@ -455,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58505,7 +62021,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58515,7 +62044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58535,7 +62064,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58554,7 +62083,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58572,7 +62101,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -372,7 +381,7 @@
+@@ -372,7 +387,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -58581,7 +62110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +419,9 @@
+@@ -410,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58603,7 +62132,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,6 +220,9 @@
+@@ -188,6 +189,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -219,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58613,7 +62155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -259,18 +263,16 @@
+@@ -259,18 +269,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58633,7 +62175,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +293,18 @@
+@@ -291,14 +299,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58652,7 +62194,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +371,17 @@
+@@ -365,14 +377,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58670,7 +62212,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -415,7 +424,7 @@
+@@ -415,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58679,7 +62221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +462,9 @@
+@@ -453,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58701,7 +62243,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58711,7 +62266,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58731,7 +62286,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58750,7 +62305,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58768,7 +62323,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -373,7 +382,7 @@
+@@ -373,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -58777,7 +62332,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +420,9 @@
+@@ -411,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58799,7 +62354,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58809,7 +62377,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58829,7 +62397,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -58848,7 +62416,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -58866,7 +62434,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -356,7 +365,7 @@
+@@ -356,7 +371,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -58875,7 +62443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +403,9 @@
+@@ -394,9 +409,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58887,7 +62455,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -539,7 +548,7 @@
+@@ -539,7 +554,7 @@
.NOEXPORT:
#>+ 2
@@ -58896,7 +62464,7 @@
#>+ 2
docs-am:
-@@ -547,98 +556,98 @@
+@@ -547,98 +562,98 @@
#>+ 95
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
@@ -59074,7 +62642,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59084,7 +62665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59104,7 +62685,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59123,7 +62704,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59141,7 +62722,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -414,7 +429,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59150,7 +62731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -452,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59172,7 +62753,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -230,6 +231,9 @@
+@@ -199,6 +200,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -230,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59182,7 +62776,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,18 +274,16 @@
+@@ -270,18 +280,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59202,7 +62796,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -302,14 +304,18 @@
+@@ -302,14 +310,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59221,7 +62815,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -376,14 +382,17 @@
+@@ -376,14 +388,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59239,7 +62833,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -421,7 +430,7 @@
+@@ -421,7 +436,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59248,7 +62842,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +468,9 @@
+@@ -459,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59270,7 +62864,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59280,7 +62887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59300,7 +62907,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59319,7 +62926,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59337,7 +62944,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -414,7 +429,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59346,7 +62953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -452,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59397,7 +63004,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -288,6 +290,9 @@
+@@ -257,6 +259,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -288,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59407,7 +63027,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,18 +333,16 @@
+@@ -328,18 +339,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59427,7 +63047,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,14 +363,18 @@
+@@ -360,14 +369,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59446,7 +63066,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -434,14 +441,17 @@
+@@ -434,14 +447,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59464,7 +63084,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -475,9 +485,10 @@
+@@ -475,9 +491,10 @@
kmmatch_SOURCES = match.cpp
kmmatch_LDFLAGS = $(all_libraries)
bin_SCRIPTS = kminspector
@@ -59477,7 +63097,7 @@
libktrace_la_LDFLAGS = -avoid-version
libktrace_la_SOURCES = ksotrace.cpp ktrace.c
libktrace_la_LIBADD = $(LIBDL)
-@@ -490,7 +501,7 @@
+@@ -490,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -59486,7 +63106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,74 +539,74 @@
+@@ -528,74 +545,74 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59590,7 +63210,7 @@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -831,10 +842,8 @@
+@@ -831,10 +848,8 @@
check: check-am
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(DATA) $(HEADERS)
@@ -59602,7 +63222,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
-@@ -865,11 +874,11 @@
+@@ -865,11 +880,11 @@
#>+ 1
clean: kde-rpo-clean clean-am
@@ -59618,7 +63238,7 @@
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-@@ -887,10 +896,10 @@
+@@ -887,10 +902,10 @@
info-am:
@@ -59632,7 +63252,7 @@
install-info: install-info-am
-@@ -918,26 +927,26 @@
+@@ -918,26 +933,26 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-excludeDATA uninstall-includeHEADERS \
@@ -59686,7 +63306,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,6 +213,9 @@
+@@ -181,6 +182,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -212,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59696,7 +63329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -252,18 +256,16 @@
+@@ -252,18 +262,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59716,7 +63349,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -284,14 +286,18 @@
+@@ -284,14 +292,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59735,7 +63368,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -358,14 +364,17 @@
+@@ -358,14 +370,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59753,7 +63386,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -402,7 +411,7 @@
+@@ -402,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59762,7 +63395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +449,9 @@
+@@ -440,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59784,7 +63417,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -225,6 +226,9 @@
+@@ -194,6 +195,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -225,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59794,7 +63440,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,18 +269,16 @@
+@@ -265,18 +275,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59814,7 +63460,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -297,14 +299,18 @@
+@@ -297,14 +305,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59833,7 +63479,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -371,14 +377,17 @@
+@@ -371,14 +383,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59851,7 +63497,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -431,7 +440,7 @@
+@@ -431,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59860,7 +63506,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +478,9 @@
+@@ -469,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59882,7 +63528,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -234,6 +235,9 @@
+@@ -203,6 +204,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -234,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59892,7 +63551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -274,18 +278,16 @@
+@@ -274,18 +284,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59912,7 +63571,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -306,14 +308,18 @@
+@@ -306,14 +314,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -59931,7 +63590,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -380,14 +386,17 @@
+@@ -380,14 +392,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -59949,7 +63608,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -471,7 +480,7 @@
+@@ -471,7 +486,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59958,7 +63617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +518,9 @@
+@@ -509,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59970,7 +63629,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -836,11 +845,11 @@
+@@ -836,11 +851,11 @@
mocs: kompareprefdlg.moc
#>+ 3
@@ -59985,7 +63644,7 @@
#>+ 3
kompareconnectwidget.moc: $(srcdir)/kompareconnectwidget.h
-@@ -850,11 +859,11 @@
+@@ -850,11 +865,11 @@
mocs: kompareconnectwidget.moc
#>+ 3
@@ -60000,7 +63659,7 @@
#>+ 3
komparesplitter.moc: $(srcdir)/komparesplitter.h
-@@ -872,7 +881,7 @@
+@@ -872,7 +887,7 @@
#>+ 3
clean-metasources:
@@ -60009,7 +63668,7 @@
#>+ 2
KDE_DIST=komparepartui.rc komparepart.desktop komparesaveoptionsbase.ui Makefile.in Makefile.am
-@@ -928,7 +937,7 @@
+@@ -928,7 +943,7 @@
#>+ 11
@@ -60018,7 +63677,7 @@
@echo 'creating libkomparepart_la.all_cpp.cpp ...'; \
rm -f libkomparepart_la.all_cpp.files libkomparepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkomparepart_la.all_cpp.final; \
-@@ -969,8 +978,8 @@
+@@ -969,8 +984,8 @@
kompare_part.lo: kompare_part.moc
komparelistview.o: komparelistview.moc
$(srcdir)/komparesplitter.cpp: komparesaveoptionsbase.h
@@ -60038,7 +63697,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -214,6 +215,9 @@
+@@ -183,6 +184,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -214,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60048,7 +63720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -254,18 +258,16 @@
+@@ -254,18 +264,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60068,7 +63740,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -286,14 +288,18 @@
+@@ -286,14 +294,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60087,7 +63759,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -360,14 +366,17 @@
+@@ -360,14 +372,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60105,7 +63777,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -429,7 +438,7 @@
+@@ -429,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60114,7 +63786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +476,9 @@
+@@ -467,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60126,7 +63798,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -705,53 +714,53 @@
+@@ -705,53 +720,53 @@
.NOEXPORT:
#>+ 3
@@ -60201,7 +63873,7 @@
#>+ 3
pagebase.moc: $(srcdir)/pagebase.h
-@@ -762,7 +771,7 @@
+@@ -762,7 +777,7 @@
#>+ 3
clean-metasources:
@@ -60210,7 +63882,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -809,7 +818,7 @@
+@@ -809,7 +824,7 @@
#>+ 11
@@ -60219,7 +63891,7 @@
@echo 'creating libdialogpages_la.all_cpp.cpp ...'; \
rm -f libdialogpages_la.all_cpp.files libdialogpages_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libdialogpages_la.all_cpp.final; \
-@@ -850,16 +859,16 @@
+@@ -850,16 +865,16 @@
filespage.lo: filespage.moc
diffsettings.o: diffsettings.moc
nmcheck:
@@ -60250,7 +63922,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -216,6 +217,9 @@
+@@ -185,6 +186,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -216,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60260,7 +63945,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,18 +260,16 @@
+@@ -256,18 +266,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60280,7 +63965,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,14 +290,18 @@
+@@ -288,14 +296,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60299,7 +63984,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -362,14 +368,17 @@
+@@ -362,14 +374,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60317,7 +64002,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -435,7 +444,7 @@
+@@ -435,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60326,7 +64011,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +482,9 @@
+@@ -473,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60348,7 +64033,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -244,6 +245,9 @@
+@@ -213,6 +214,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -244,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60358,7 +64056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -284,18 +288,16 @@
+@@ -284,18 +294,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60378,7 +64076,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -316,14 +318,18 @@
+@@ -316,14 +324,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60397,7 +64095,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -390,14 +396,17 @@
+@@ -390,14 +402,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60415,7 +64113,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -458,7 +467,7 @@
+@@ -458,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60424,7 +64122,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +505,9 @@
+@@ -496,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60446,7 +64144,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -173,6 +174,9 @@
+@@ -142,6 +143,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -173,6 +180,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60456,7 +64167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -213,18 +217,16 @@
+@@ -213,18 +223,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60476,7 +64187,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +247,18 @@
+@@ -245,14 +253,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60495,7 +64206,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +325,17 @@
+@@ -319,14 +331,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60513,7 +64224,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -356,7 +365,7 @@
+@@ -356,7 +371,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -60522,7 +64233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +403,9 @@
+@@ -394,9 +409,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60534,7 +64245,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -546,26 +555,26 @@
+@@ -546,26 +561,26 @@
#>+ 22
install-kde-icons:
@@ -60580,7 +64291,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -186,6 +187,9 @@
+@@ -155,6 +156,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -186,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60590,7 +64314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -226,18 +230,16 @@
+@@ -226,18 +236,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60610,7 +64334,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -258,14 +260,18 @@
+@@ -258,14 +266,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60629,7 +64353,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -332,14 +338,17 @@
+@@ -332,14 +344,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60647,7 +64371,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -369,7 +378,7 @@
+@@ -369,7 +384,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -60656,7 +64380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +416,9 @@
+@@ -407,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60678,7 +64402,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -228,6 +229,9 @@
+@@ -197,6 +198,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -228,6 +235,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60688,7 +64425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -268,18 +272,16 @@
+@@ -268,18 +278,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60708,7 +64445,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +302,18 @@
+@@ -300,14 +308,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60727,7 +64464,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +380,17 @@
+@@ -374,14 +386,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60745,7 +64482,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -430,7 +439,7 @@
+@@ -430,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60754,7 +64491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +477,9 @@
+@@ -468,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60766,7 +64503,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -783,18 +792,18 @@
+@@ -783,18 +798,18 @@
mocs: sigslotview.moc
#>+ 3
@@ -60791,7 +64528,7 @@
#>+ 3
navview.moc: $(srcdir)/navview.h
-@@ -819,7 +828,7 @@
+@@ -819,7 +834,7 @@
#>+ 3
clean-metasources:
@@ -60800,7 +64537,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -870,7 +879,7 @@
+@@ -870,7 +885,7 @@
#>+ 11
@@ -60809,7 +64546,7 @@
@echo 'creating libkspy_la.all_cpp.cpp ...'; \
rm -f libkspy_la.all_cpp.files libkspy_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkspy_la.all_cpp.final; \
-@@ -907,8 +916,8 @@
+@@ -907,8 +922,8 @@
#>+ 15
classinfoview.lo: classinfoview.moc
@@ -60829,7 +64566,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -229,6 +230,9 @@
+@@ -198,6 +199,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -229,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60839,7 +64589,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,18 +273,16 @@
+@@ -269,18 +279,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60859,7 +64609,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -301,14 +303,18 @@
+@@ -301,14 +309,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60878,7 +64628,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -375,14 +381,17 @@
+@@ -375,14 +387,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60896,7 +64646,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -420,7 +429,7 @@
+@@ -420,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -60905,7 +64655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +467,9 @@
+@@ -458,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60927,7 +64677,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -249,6 +250,9 @@
+@@ -218,6 +219,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -249,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60937,7 +64700,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,18 +293,16 @@
+@@ -289,18 +299,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60957,7 +64720,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,14 +323,18 @@
+@@ -321,14 +329,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -60976,7 +64739,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -395,14 +401,17 @@
+@@ -395,14 +407,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -60994,7 +64757,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -479,7 +488,7 @@
+@@ -479,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61003,7 +64766,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +526,9 @@
+@@ -517,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61015,7 +64778,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -975,23 +984,23 @@
+@@ -975,23 +990,23 @@
#>+ 19
install-kde-icons:
@@ -61055,7 +64818,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,9 @@
+@@ -158,6 +159,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -189,6 +196,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61065,7 +64841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -229,18 +233,16 @@
+@@ -229,18 +239,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61085,7 +64861,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +263,18 @@
+@@ -261,14 +269,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61104,7 +64880,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +341,17 @@
+@@ -335,14 +347,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61122,7 +64898,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -372,7 +381,7 @@
+@@ -372,7 +387,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -61131,7 +64907,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +419,9 @@
+@@ -410,9 +425,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61153,7 +64929,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,9 @@
+@@ -187,6 +188,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -218,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61163,7 +64952,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,18 +262,16 @@
+@@ -258,18 +268,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61183,7 +64972,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +292,18 @@
+@@ -290,14 +298,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61202,7 +64991,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +370,17 @@
+@@ -364,14 +376,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61220,7 +65009,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -411,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61229,7 +65018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -449,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61251,7 +65040,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -216,6 +217,9 @@
+@@ -185,6 +186,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -216,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61261,7 +65063,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,18 +260,16 @@
+@@ -256,18 +266,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61281,7 +65083,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,14 +290,18 @@
+@@ -288,14 +296,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61300,7 +65102,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -362,14 +368,17 @@
+@@ -362,14 +374,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61318,7 +65120,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -412,7 +421,7 @@
+@@ -412,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61327,7 +65129,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +459,9 @@
+@@ -450,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61349,7 +65151,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -249,6 +250,9 @@
+@@ -218,6 +219,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -249,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61359,7 +65174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,18 +293,16 @@
+@@ -289,18 +299,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61379,7 +65194,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,14 +323,18 @@
+@@ -321,14 +329,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61398,7 +65213,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -395,14 +401,17 @@
+@@ -395,14 +407,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61416,7 +65231,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -448,7 +457,7 @@
+@@ -448,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61425,7 +65240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +495,9 @@
+@@ -486,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61437,6 +65252,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- Makefile.am
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ ## kdesdk/Makefile.am
+ ## (C) 1997 Stephan Kulow
+
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+ DISTCLEANFILES = inst-apps
+
+ MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 SUBDIRS
--- Makefile.in
+++ Makefile.in
@@ -127,6 +127,7 @@
@@ -61447,7 +65273,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -206,6 +207,9 @@
+@@ -175,6 +176,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -206,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61457,7 +65296,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -246,18 +250,16 @@
+@@ -246,18 +256,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61477,7 +65316,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -278,14 +280,18 @@
+@@ -278,14 +286,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61496,7 +65335,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -352,14 +358,17 @@
+@@ -352,14 +364,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61514,7 +65353,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -395,7 +404,7 @@
+@@ -383,7 +398,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+ DISTCLEANFILES = inst-apps
+ MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 SUBDIRS
+ SUBDIRS = $(TOPSUBDIRS)
+@@ -395,7 +410,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -61523,7 +65371,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,12 +446,12 @@
+@@ -437,12 +452,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -61538,7 +65386,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -454,7 +463,7 @@
+@@ -454,7 +469,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -61547,12 +65395,12 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -880,7 +889,7 @@
+@@ -880,7 +895,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 kdesdk.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in kdesdk.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdesdk.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
@@ -61566,7 +65414,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -178,6 +179,9 @@
+@@ -147,6 +148,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -178,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61576,7 +65437,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -218,18 +222,16 @@
+@@ -218,18 +228,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61596,7 +65457,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -250,14 +252,18 @@
+@@ -250,14 +258,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61615,7 +65476,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -324,14 +330,17 @@
+@@ -324,14 +336,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61633,7 +65494,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -406,7 +415,7 @@
+@@ -406,7 +421,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61642,7 +65503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +453,9 @@
+@@ -444,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61664,7 +65525,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,9 @@
+@@ -159,6 +160,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -190,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61674,7 +65548,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -230,18 +234,16 @@
+@@ -230,18 +240,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61694,7 +65568,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +264,18 @@
+@@ -262,14 +270,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61713,7 +65587,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +342,17 @@
+@@ -336,14 +348,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61731,7 +65605,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -373,7 +382,7 @@
+@@ -373,7 +388,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -61740,7 +65614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -411,9 +420,9 @@
+@@ -411,9 +426,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61762,7 +65636,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -226,6 +227,9 @@
+@@ -195,6 +196,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -226,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61772,7 +65659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -266,18 +270,16 @@
+@@ -266,18 +276,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61792,7 +65679,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,14 +300,18 @@
+@@ -298,14 +306,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61811,7 +65698,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -372,14 +378,17 @@
+@@ -372,14 +384,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61829,7 +65716,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -448,7 +457,7 @@
+@@ -448,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61838,7 +65725,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +495,9 @@
+@@ -486,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61860,7 +65747,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -265,6 +266,9 @@
+@@ -234,6 +235,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -265,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61870,7 +65770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -305,18 +309,16 @@
+@@ -305,18 +315,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61890,7 +65790,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,14 +339,18 @@
+@@ -337,14 +345,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -61909,7 +65809,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -411,14 +417,17 @@
+@@ -411,14 +423,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -61927,7 +65827,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -467,7 +476,7 @@
+@@ -467,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .pot .po .xml .txml .cpp .lo .o .obj
@@ -61936,7 +65836,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +514,9 @@
+@@ -505,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61958,7 +65858,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -237,6 +238,9 @@
+@@ -206,6 +207,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -237,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61968,7 +65881,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -277,18 +281,16 @@
+@@ -277,18 +287,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61988,7 +65901,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -309,14 +311,18 @@
+@@ -309,14 +317,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62007,7 +65920,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -383,14 +389,17 @@
+@@ -383,14 +395,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62025,7 +65938,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -431,7 +440,7 @@
+@@ -431,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62034,7 +65947,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +478,9 @@
+@@ -469,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62056,7 +65969,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,9 @@
+@@ -159,6 +160,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -190,6 +197,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62066,7 +65992,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -230,18 +234,16 @@
+@@ -230,18 +240,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62086,7 +66012,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +264,18 @@
+@@ -262,14 +270,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62105,7 +66031,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +342,17 @@
+@@ -336,14 +348,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62123,7 +66049,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,12 +417,17 @@
+@@ -408,12 +423,17 @@
kde-devel-emacs.el kde-devel-gdb kde-devel-vim.vim \
kde.supp kdesvn-buildrc-sample
@@ -62142,7 +66068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +465,9 @@
+@@ -451,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62154,7 +66080,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -678,30 +692,26 @@
+@@ -678,30 +698,26 @@
uninstall-kdesvn_build_syntaxDATA uninstall-man uninstall-man1
@@ -62203,7 +66129,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -192,6 +193,9 @@
+@@ -161,6 +162,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -192,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62213,7 +66152,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -232,18 +236,16 @@
+@@ -232,18 +242,16 @@
VERSION := `cat ${PWD}/VERSION`
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62233,7 +66172,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -264,14 +266,18 @@
+@@ -264,14 +272,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62252,7 +66191,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -338,14 +344,17 @@
+@@ -338,14 +350,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62270,7 +66209,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -381,7 +390,7 @@
+@@ -381,7 +396,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -62279,7 +66218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +428,9 @@
+@@ -419,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62301,7 +66240,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -212,6 +213,9 @@
+@@ -181,6 +182,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -212,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62311,7 +66263,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -252,18 +256,16 @@
+@@ -252,18 +262,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62331,7 +66283,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -284,14 +286,18 @@
+@@ -284,14 +292,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62350,7 +66302,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -358,14 +364,17 @@
+@@ -358,14 +370,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62368,7 +66320,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -415,7 +424,7 @@
+@@ -415,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62377,7 +66329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +462,9 @@
+@@ -453,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62389,104 +66341,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- umbrello/umbrello/classparser/Makefile.in
-+++ umbrello/umbrello/classparser/Makefile.in
-@@ -131,6 +131,7 @@
- FFLAGS = @FFLAGS@
- FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -210,6 +211,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -250,18 +254,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +284,18 @@
- cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
- cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +362,17 @@
- kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
- poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -396,7 +405,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -434,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
--- umbrello/umbrello/clipboard/Makefile.in
+++ umbrello/umbrello/clipboard/Makefile.in
@@ -127,6 +127,7 @@
@@ -62497,7 +66351,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -206,6 +207,9 @@
+@@ -175,6 +176,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -206,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62507,7 +66374,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -246,18 +250,16 @@
+@@ -246,18 +256,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62527,7 +66394,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -278,14 +280,18 @@
+@@ -278,14 +286,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62546,7 +66413,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -352,14 +358,17 @@
+@@ -352,14 +364,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62564,7 +66431,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -393,7 +402,7 @@
+@@ -393,7 +408,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62573,7 +66440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +440,9 @@
+@@ -431,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62595,7 +66462,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -259,6 +260,9 @@
+@@ -228,6 +229,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -259,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62605,7 +66485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -299,18 +303,16 @@
+@@ -299,18 +309,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62625,7 +66505,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -331,14 +333,18 @@
+@@ -331,14 +339,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62644,7 +66524,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -405,14 +411,17 @@
+@@ -405,14 +417,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62662,7 +66542,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -506,7 +515,7 @@
+@@ -506,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62671,7 +66551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +553,9 @@
+@@ -544,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62683,7 +66563,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -890,18 +899,18 @@
+@@ -891,18 +906,18 @@
mocs: javacodeclassfield.moc
#>+ 3
@@ -62708,7 +66588,7 @@
#>+ 3
cppcodegenerationpolicypage.moc: $(srcdir)/cppcodegenerationpolicypage.h
-@@ -932,18 +941,18 @@
+@@ -933,18 +948,18 @@
mocs: javaclassdeclarationblock.moc
#>+ 3
@@ -62733,7 +66613,7 @@
#>+ 3
xmlcodecomment.moc: $(srcdir)/xmlcodecomment.h
-@@ -953,6 +962,13 @@
+@@ -954,6 +969,13 @@
mocs: xmlcodecomment.moc
#>+ 3
@@ -62747,7 +66627,7 @@
javacodegenerationpolicy.moc: $(srcdir)/javacodegenerationpolicy.h
$(MOC) $(srcdir)/javacodegenerationpolicy.h -o javacodegenerationpolicy.moc
-@@ -967,13 +983,6 @@
+@@ -968,13 +990,6 @@
mocs: rubyclassifiercodedocument.moc
#>+ 3
@@ -62761,7 +66641,7 @@
rubycodeclassfield.moc: $(srcdir)/rubycodeclassfield.h
$(MOC) $(srcdir)/rubycodeclassfield.h -o rubycodeclassfield.moc
-@@ -981,18 +990,18 @@
+@@ -982,18 +997,18 @@
mocs: rubycodeclassfield.moc
#>+ 3
@@ -62786,7 +66666,7 @@
#>+ 3
sqlwriter.moc: $(srcdir)/sqlwriter.h
-@@ -1016,18 +1025,18 @@
+@@ -1017,18 +1032,18 @@
mocs: cppheadercodeaccessormethod.moc
#>+ 3
@@ -62811,7 +66691,7 @@
#>+ 3
javacodegenerator.moc: $(srcdir)/javacodegenerator.h
-@@ -1037,18 +1046,18 @@
+@@ -1038,18 +1053,18 @@
mocs: javacodegenerator.moc
#>+ 3
@@ -62836,7 +66716,7 @@
#>+ 3
cppcodecomment.moc: $(srcdir)/cppcodecomment.h
-@@ -1065,6 +1074,13 @@
+@@ -1066,6 +1081,13 @@
mocs: cppmakecodedocument.moc
#>+ 3
@@ -62850,7 +66730,7 @@
pythonwriter.moc: $(srcdir)/pythonwriter.h
$(MOC) $(srcdir)/pythonwriter.h -o pythonwriter.moc
-@@ -1079,13 +1095,6 @@
+@@ -1080,13 +1102,6 @@
mocs: javacodedocumentation.moc
#>+ 3
@@ -62864,19 +66744,241 @@
cppcodeclassfield.moc: $(srcdir)/cppcodeclassfield.h
$(MOC) $(srcdir)/cppcodeclassfield.h -o cppcodeclassfield.moc
-@@ -1199,10 +1208,10 @@
+@@ -1207,10 +1222,10 @@
#>+ 3
clean-metasources:
-- -rm -f cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc xmlschemawriter.moc rubycodegenerationpolicypage.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc cppcodegenerator.moc aswriter.moc xmlcodecomment.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc cppsourcecodedocument.moc rubycodeclassfield.moc cppcodegenerationpolicy.moc simplecodegenerator.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc rubycodecomment.moc jswriter.moc javacodegenerator.moc javacodegenerationpolicypage.moc rubywriter.moc cppcodecomment.moc cppmakecodedocument.moc pythonwriter.moc javacodedocumentation.moc javacodeoperation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
-+ -rm -f cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc rubycodegenerationpolicypage.moc xmlschemawriter.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc aswriter.moc cppcodegenerator.moc xmlcodecomment.moc cppsourcecodedocument.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc rubycodeclassfield.moc simplecodegenerator.moc cppcodegenerationpolicy.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc jswriter.moc rubycodecomment.moc javacodegenerator.moc rubywriter.moc javacodegenerationpolicypage.moc cppcodecomment.moc cppmakecodedocument.moc javacodeoperation.moc pythonwriter.moc javacodedocumentation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
+- -rm -f cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc xmlschemawriter.moc rubycodegenerationpolicypage.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc cppcodegenerator.moc aswriter.moc xmlcodecomment.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc cppsourcecodedocument.moc rubycodeclassfield.moc cppcodegenerationpolicy.moc simplecodegenerator.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc rubycodecomment.moc jswriter.moc javacodegenerator.moc javacodegenerationpolicypage.moc rubywriter.moc cppcodecomment.moc cppmakecodedocument.moc pythonwriter.moc javacodedocumentation.moc javacodeoperation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc pascalwriter.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
++ -rm -f cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc rubycodegenerationpolicypage.moc xmlschemawriter.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc aswriter.moc cppcodegenerator.moc xmlcodecomment.moc cppsourcecodedocument.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc rubycodeclassfield.moc simplecodegenerator.moc cppcodegenerationpolicy.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc jswriter.moc rubycodecomment.moc javacodegenerator.moc rubywriter.moc javacodegenerationpolicypage.moc cppcodecomment.moc cppmakecodedocument.moc javacodeoperation.moc pythonwriter.moc javacodedocumentation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc pascalwriter.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
#>+ 2
--KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppcodeclassfield.h cppsourcecodeclassfielddeclarationblock.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheaderclassdeclarationblock.h cppheadercodeclassfielddeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h cppcodecomment.h javacodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubycodegenerator.h rubyclassdeclarationblock.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h
-+KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppsourcecodeclassfielddeclarationblock.h cppcodeclassfield.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheadercodeclassfielddeclarationblock.h cppheaderclassdeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h javacodecomment.h cppcodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubyclassdeclarationblock.h rubycodegenerator.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h
+-KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h pascalwriter.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppcodeclassfield.h cppsourcecodeclassfielddeclarationblock.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheaderclassdeclarationblock.h cppheadercodeclassfielddeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h cppcodecomment.h javacodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubycodegenerator.h rubyclassdeclarationblock.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h
++KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h pascalwriter.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppsourcecodeclassfielddeclarationblock.h cppcodeclassfield.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheadercodeclassfielddeclarationblock.h cppheaderclassdeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h javacodecomment.h cppcodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubyclassdeclarationblock.h rubycodegenerator.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h
#>+ 6
clean-ui:
+--- umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
++++ umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
+@@ -131,6 +131,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -179,6 +180,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -210,6 +217,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -250,18 +260,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -282,14 +290,18 @@
+ cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
+ cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
+@@ -356,14 +368,17 @@
+ kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
+ poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -396,7 +411,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +449,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- umbrello/umbrello/codeimport/Makefile.in
++++ umbrello/umbrello/codeimport/Makefile.in
+@@ -145,6 +145,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -193,6 +194,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -224,6 +231,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -264,18 +274,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -296,14 +304,18 @@
+ cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
+ cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
+@@ -370,14 +382,17 @@
+ kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
+ poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +426,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -449,9 +464,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
--- umbrello/umbrello/dialogs/Makefile.in
+++ umbrello/umbrello/dialogs/Makefile.in
@@ -151,6 +151,7 @@
@@ -62887,7 +66989,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -230,6 +231,9 @@
+@@ -199,6 +200,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -230,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62897,7 +67012,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,18 +274,16 @@
+@@ -270,18 +280,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62917,7 +67032,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -302,14 +304,18 @@
+@@ -302,14 +310,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -62936,7 +67051,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -376,14 +382,17 @@
+@@ -376,14 +388,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -62954,7 +67069,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -507,7 +516,7 @@
+@@ -507,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62963,7 +67078,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +554,9 @@
+@@ -545,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62975,7 +67090,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -845,18 +854,18 @@
+@@ -845,18 +860,18 @@
mocs: pkgcontentspage.moc
#>+ 3
@@ -63000,7 +67115,7 @@
#>+ 3
assocpropdlg.moc: $(srcdir)/assocpropdlg.h
-@@ -873,18 +882,18 @@
+@@ -873,18 +888,18 @@
mocs: activitydialog.moc
#>+ 3
@@ -63025,7 +67140,7 @@
#>+ 3
umloperationdialog.moc: $(srcdir)/umloperationdialog.h
-@@ -922,13 +931,6 @@
+@@ -922,13 +937,6 @@
mocs: classpropdlg.moc
#>+ 3
@@ -63039,7 +67154,7 @@
classgenpage.moc: $(srcdir)/classgenpage.h
$(MOC) $(srcdir)/classgenpage.h -o classgenpage.moc
-@@ -936,11 +938,11 @@
+@@ -936,11 +944,11 @@
mocs: classgenpage.moc
#>+ 3
@@ -63054,7 +67169,7 @@
#>+ 3
defaultcodegenpolicypage.moc: $(srcdir)/defaultcodegenpolicypage.h
-@@ -950,6 +952,13 @@
+@@ -950,6 +958,13 @@
mocs: defaultcodegenpolicypage.moc
#>+ 3
@@ -63068,7 +67183,7 @@
assocrolepage.moc: $(srcdir)/assocrolepage.h
$(MOC) $(srcdir)/assocrolepage.h -o assocrolepage.moc
-@@ -971,6 +980,13 @@
+@@ -971,6 +986,13 @@
mocs: classifierlistpage.moc
#>+ 3
@@ -63082,7 +67197,7 @@
settingsdlg.moc: $(srcdir)/settingsdlg.h
$(MOC) $(srcdir)/settingsdlg.h -o settingsdlg.moc
-@@ -985,11 +1001,11 @@
+@@ -985,11 +1007,11 @@
mocs: codeeditor.moc
#>+ 3
@@ -63097,7 +67212,7 @@
#>+ 3
codevieweroptionspage.moc: $(srcdir)/codevieweroptionspage.h
-@@ -1006,13 +1022,6 @@
+@@ -1006,13 +1028,6 @@
mocs: statedialog.moc
#>+ 3
@@ -63111,7 +67226,7 @@
overwritedialogue.moc: $(srcdir)/overwritedialogue.h
$(MOC) $(srcdir)/overwritedialogue.h -o overwritedialogue.moc
-@@ -1028,7 +1037,7 @@
+@@ -1028,7 +1043,7 @@
#>+ 3
clean-metasources:
@@ -63120,7 +67235,7 @@
#>+ 2
KDE_DIST=activitydialog.h codegenerationoptionspage.h classpropdlg.h assocrolepage.h classifierlistpage.h activitypage.h umltemplatedialog.h overwritedialogue.h umlviewdialog.h settingsdlg.h Makefile.in codegenerationpolicypage.h pkgcontentspage.h dialogpage.h notedialog.h codevieweroptionspage.h defaultcodegenpolicypage.h parmpropdlg.h selectopdlg.h codegenerationoptionsbase.ui assocpage.h umlroleproperties.h umlentityattributedialog.h umloperationdialog.h diagrampropertiespage.ui umlrolepropertiesbase.ui assocpropdlg.h umlwidgetcolorpage.h exportallviewsdialogbase.ui assocgenpage.h codegenerationpolicybase.ui codegenerationwizardbase.ui exportallviewsdialog.h umlroledialog.h statedialog.h codeeditor.h diagramprintpage.h codeviewerdialog.h classwizard.h codevieweroptionsbase.ui codeviewerdialogbase.ui classgenpage.h umlattributedialog.h classoptionspage.h codegenerationwizard.h Makefile.am
-@@ -1087,7 +1096,7 @@
+@@ -1087,7 +1102,7 @@
#>+ 11
@@ -63129,6 +67244,918 @@
@echo 'creating libdialogs_la.all_cpp.cpp ...'; \
rm -f libdialogs_la.all_cpp.files libdialogs_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libdialogs_la.all_cpp.final; \
+--- umbrello/umbrello/docgenerators/Makefile.in
++++ umbrello/umbrello/docgenerators/Makefile.in
+@@ -0,0 +1,909 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 483858 $
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++
++
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++bin_PROGRAMS = umbodoc$(EXEEXT)
++subdir = umbrello/umbrello/docgenerators
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
++ "$(DESTDIR)$(appdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libdocgenerators_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++am_libdocgenerators_la_OBJECTS = docbookgenerator.lo xhtmlgenerator.lo
++#>- libdocgenerators_la_OBJECTS = $(am_libdocgenerators_la_OBJECTS)
++#>+ 4
++libdocgenerators_la_final_OBJECTS = libdocgenerators_la.all_cpp.lo
++libdocgenerators_la_nofinal_OBJECTS = docbookgenerator.lo xhtmlgenerator.lo
++ at KDE_USE_FINAL_FALSE@libdocgenerators_la_OBJECTS = $(libdocgenerators_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@libdocgenerators_la_OBJECTS = $(libdocgenerators_la_final_OBJECTS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
++am_umbodoc_OBJECTS = main.$(OBJEXT)
++#>- umbodoc_OBJECTS = $(am_umbodoc_OBJECTS)
++#>+ 1
++umbodoc_OBJECTS = main.$(OBJEXT)
++umbodoc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libdocgenerators_la_SOURCES) $(umbodoc_SOURCES)
++DIST_SOURCES = $(libdocgenerators_la_SOURCES) $(umbodoc_SOURCES)
++appDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(app_DATA)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DBIV_INCLUDES = @DBIV_INCLUDES@
++DBIV_LDFLAGS = @DBIV_LDFLAGS@
++DBIV_NAME = @DBIV_NAME@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++GREP = @GREP@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCACHEGRIND_VERSION = @KCACHEGRIND_VERSION@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
++KDE_INCLUDES = @KDE_INCLUDES@
++KDE_LDFLAGS = @KDE_LDFLAGS@
++KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
++KDE_MT_LIBS = @KDE_MT_LIBS@
++KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
++KDE_PLUGIN = @KDE_PLUGIN@
++KDE_RPATH = @KDE_RPATH@
++KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
++KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
++KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
++KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
++KDE_USE_FPIE = @KDE_USE_FPIE@
++KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
++KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
++KDE_USE_PIE = @KDE_USE_PIE@
++KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
++KMTRACE_LIBS = @KMTRACE_LIBS@
++LDFLAGS = @LDFLAGS@
++LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
++LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
++LEX = @LEX@
++LEXLIB = @LEXLIB@
++LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
++LIBCOMPAT = @LIBCOMPAT@
++LIBCRYPT = @LIBCRYPT@
++LIBDL = @LIBDL@
++LIBJPEG = @LIBJPEG@
++LIBOBJS = @LIBOBJS@
++LIBPNG = @LIBPNG@
++LIBPTHREAD = @LIBPTHREAD@
++LIBRESOLV = @LIBRESOLV@
++LIBS = @LIBS@
++LIBSM = @LIBSM@
++LIBSOCKET = @LIBSOCKET@
++LIBTOOL = @LIBTOOL@
++LIBUCB = @LIBUCB@
++LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
++LIBZ = @LIBZ@
++LIB_DBIV = @LIB_DBIV@
++LIB_KAB = @LIB_KAB@
++LIB_KABC = @LIB_KABC@
++LIB_KDECORE = @LIB_KDECORE@
++LIB_KDED = @LIB_KDED@
++LIB_KDEPIM = @LIB_KDEPIM@
++LIB_KDEPRINT = @LIB_KDEPRINT@
++LIB_KDEUI = @LIB_KDEUI@
++LIB_KDNSSD = @LIB_KDNSSD@
++LIB_KFILE = @LIB_KFILE@
++LIB_KFM = @LIB_KFM@
++LIB_KHTML = @LIB_KHTML@
++LIB_KIMPROXY = @LIB_KIMPROXY@
++LIB_KIO = @LIB_KIO@
++LIB_KJS = @LIB_KJS@
++LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
++LIB_KPARTS = @LIB_KPARTS@
++LIB_KSPELL = @LIB_KSPELL@
++LIB_KSYCOCA = @LIB_KSYCOCA@
++LIB_KUNITTEST = @LIB_KUNITTEST@
++LIB_KUTILS = @LIB_KUTILS@
++LIB_POLL = @LIB_POLL@
++LIB_QPE = @LIB_QPE@
++LIB_QT = @LIB_QT@
++LIB_SMB = @LIB_SMB@
++LIB_X11 = @LIB_X11@
++LIB_XEXT = @LIB_XEXT@
++LIB_XRENDER = @LIB_XRENDER@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
++MAKEINFO = @MAKEINFO@
++MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
++MCOPIDL = @MCOPIDL@
++MEINPROC = @MEINPROC@
++MOC = @MOC@
++MSGFMT = @MSGFMT@
++NOOPT_CFLAGS = @NOOPT_CFLAGS@
++NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PERL = @PERL@
++QTE_NORTTI = @QTE_NORTTI@
++QT_INCLUDES = @QT_INCLUDES@
++QT_LDFLAGS = @QT_LDFLAGS@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SVNCONFIG = @SVNCONFIG@
++SVNLD = @SVNLD@
++SVN_CPPFLAGS = @SVN_CPPFLAGS@
++SVN_INCLUDE = @SVN_INCLUDE@
++SVN_LIB = @SVN_LIB@
++TOPSUBDIRS = @TOPSUBDIRS@
++UIC = @UIC@
++UIC_TR = @UIC_TR@
++USER_INCLUDES = @USER_INCLUDES@
++USER_LDFLAGS = @USER_LDFLAGS@
++USE_EXCEPTIONS = @USE_EXCEPTIONS@
++USE_RTTI = @USE_RTTI@
++USE_THREADS = @USE_THREADS@
++VERSION = @VERSION@
++WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++XMLLINT = @XMLLINT@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_INCLUDES = @X_INCLUDES@
++X_LDFLAGS = @X_LDFLAGS@
++X_PRE_LIBS = @X_PRE_LIBS@
++X_RPATH = @X_RPATH@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++all_includes = @all_includes@
++all_libraries = @all_libraries@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
++cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
++datadir = @datadir@
++datarootdir = @datarootdir@
++doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
++doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++include_ARTS_FALSE = @include_ARTS_FALSE@
++include_ARTS_TRUE = @include_ARTS_TRUE@
++include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
++include_DBSEARCHENGINE_TRUE = @include_DBSEARCHENGINE_TRUE@
++include_kcalresource_FALSE = @include_kcalresource_FALSE@
++include_kcalresource_TRUE = @include_kcalresource_TRUE@
++include_kioslave_svn_FALSE = @include_kioslave_svn_FALSE@
++include_kioslave_svn_TRUE = @include_kioslave_svn_TRUE@
++include_x11_FALSE = @include_x11_FALSE@
++include_x11_TRUE = @include_x11_TRUE@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++kapptemplate_SUBDIR_included_FALSE = @kapptemplate_SUBDIR_included_FALSE@
++kapptemplate_SUBDIR_included_TRUE = @kapptemplate_SUBDIR_included_TRUE@
++kbabel_SUBDIR_included_FALSE = @kbabel_SUBDIR_included_FALSE@
++kbabel_SUBDIR_included_TRUE = @kbabel_SUBDIR_included_TRUE@
++kbugbuster_SUBDIR_included_FALSE = @kbugbuster_SUBDIR_included_FALSE@
++kbugbuster_SUBDIR_included_TRUE = @kbugbuster_SUBDIR_included_TRUE@
++kcachegrind_SUBDIR_included_FALSE = @kcachegrind_SUBDIR_included_FALSE@
++kcachegrind_SUBDIR_included_TRUE = @kcachegrind_SUBDIR_included_TRUE@
++kde_appsdir = @kde_appsdir@
++kde_bindir = @kde_bindir@
++kde_confdir = @kde_confdir@
++kde_datadir = @kde_datadir@
++kde_htmldir = @kde_htmldir@
++kde_icondir = @kde_icondir@
++kde_includes = @kde_includes@
++kde_kcfgdir = @kde_kcfgdir@
++kde_libraries = @kde_libraries@
++kde_libs_htmldir = @kde_libs_htmldir@
++kde_libs_prefix = @kde_libs_prefix@
++kde_locale = @kde_locale@
++kde_mimedir = @kde_mimedir@
++kde_moduledir = @kde_moduledir@
++kde_qtver = @kde_qtver@
++kde_servicesdir = @kde_servicesdir@
++kde_servicetypesdir = @kde_servicetypesdir@
++kde_sounddir = @kde_sounddir@
++kde_styledir = @kde_styledir@
++kde_templatesdir = @kde_templatesdir@
++kde_wallpaperdir = @kde_wallpaperdir@
++kde_widgetdir = @kde_widgetdir@
++kdeaccounts_plugin_SUBDIR_included_FALSE = @kdeaccounts_plugin_SUBDIR_included_FALSE@
++kdeaccounts_plugin_SUBDIR_included_TRUE = @kdeaccounts_plugin_SUBDIR_included_TRUE@
++kdeinitdir = @kdeinitdir@
++kfile_plugins_SUBDIR_included_FALSE = @kfile_plugins_SUBDIR_included_FALSE@
++kfile_plugins_SUBDIR_included_TRUE = @kfile_plugins_SUBDIR_included_TRUE@
++kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
++kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
++kmtrace_SUBDIR_included_FALSE = @kmtrace_SUBDIR_included_FALSE@
++kmtrace_SUBDIR_included_TRUE = @kmtrace_SUBDIR_included_TRUE@
++kompare_SUBDIR_included_FALSE = @kompare_SUBDIR_included_FALSE@
++kompare_SUBDIR_included_TRUE = @kompare_SUBDIR_included_TRUE@
++kprofilemethod_SUBDIR_included_FALSE = @kprofilemethod_SUBDIR_included_FALSE@
++kprofilemethod_SUBDIR_included_TRUE = @kprofilemethod_SUBDIR_included_TRUE@
++kspy_SUBDIR_included_FALSE = @kspy_SUBDIR_included_FALSE@
++kspy_SUBDIR_included_TRUE = @kspy_SUBDIR_included_TRUE@
++kstartperf_SUBDIR_included_FALSE = @kstartperf_SUBDIR_included_FALSE@
++kstartperf_SUBDIR_included_TRUE = @kstartperf_SUBDIR_included_TRUE@
++kuiviewer_SUBDIR_included_FALSE = @kuiviewer_SUBDIR_included_FALSE@
++kuiviewer_SUBDIR_included_TRUE = @kuiviewer_SUBDIR_included_TRUE@
++kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
++kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
++poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++qt_includes = @qt_includes@
++qt_libraries = @qt_libraries@
++sbindir = @sbindir@
++scheck_SUBDIR_included_FALSE = @scheck_SUBDIR_included_FALSE@
++scheck_SUBDIR_included_TRUE = @scheck_SUBDIR_included_TRUE@
++scripts_SUBDIR_included_FALSE = @scripts_SUBDIR_included_FALSE@
++scripts_SUBDIR_included_TRUE = @scripts_SUBDIR_included_TRUE@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
++umbrello_SUBDIR_included_FALSE = @umbrello_SUBDIR_included_FALSE@
++umbrello_SUBDIR_included_TRUE = @umbrello_SUBDIR_included_TRUE@
++unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
++unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++x_includes = @x_includes@
++x_libraries = @x_libraries@
++xdg_appsdir = @xdg_appsdir@
++xdg_directorydir = @xdg_directorydir@
++xdg_menudir = @xdg_menudir@
++INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbrello/umbrello $(LIBXML_CFLAGS) $(all_includes)
++#>- METASOURCES = AUTO
++AM_LDFLAGS = $(all_libraries)
++umbodoc_COMPILE_FIRST = version.h
++umbodoc_SOURCES = main.cpp
++umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
++lib_LTLIBRARIES = libdocgenerators.la
++noinst_HEADERS = docbookgenerator.h version.h
++libdocgenerators_la_SOURCES = docbookgenerator.h docbookgenerator.cpp xhtmlgenerator.cpp
++libdocgenerators_la_LIBADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
++appdir = $(kde_datadir)/umbrello
++app_DATA = xmi2docbook.xsl docbook2xhtml.xsl xmi.css common.ent
++CLEANFILES = version.h
++#>- all: all-am
++#>+ 1
++all: docs-am all-am
++
++.SUFFIXES:
++.SUFFIXES: .cpp .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile'; \
++#>- cd $(top_srcdir) && \
++#>- $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile
++#>+ 12
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile
++ cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ else :; fi; \
++ done
++
++uninstall-libLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ done
++
++clean-libLTLIBRARIES:
++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ test "$$dir" != "$$p" || dir=.; \
++ echo "rm -f \"$${dir}/so_locations\""; \
++ rm -f "$${dir}/so_locations"; \
++ done
++libdocgenerators.la: $(libdocgenerators_la_OBJECTS) $(libdocgenerators_la_DEPENDENCIES)
++ $(CXXLINK) -rpath $(libdir) $(libdocgenerators_la_LDFLAGS) $(libdocgenerators_la_OBJECTS) $(libdocgenerators_la_LIBADD) $(LIBS)
++install-binPROGRAMS: $(bin_PROGRAMS)
++ @$(NORMAL_INSTALL)
++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ if test -f $$p \
++ || test -f $$p1 \
++ ; then \
++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++ else :; fi; \
++ done
++
++uninstall-binPROGRAMS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++ rm -f "$(DESTDIR)$(bindir)/$$f"; \
++ done
++
++clean-binPROGRAMS:
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
++umbodoc$(EXEEXT): $(umbodoc_OBJECTS) $(umbodoc_DEPENDENCIES)
++ @rm -f umbodoc$(EXEEXT)
++ $(CXXLINK) $(umbodoc_LDFLAGS) $(umbodoc_OBJECTS) $(umbodoc_LDADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT)
++
++distclean-compile:
++ -rm -f *.tab.c
++
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/docbookgenerator.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xhtmlgenerator.Plo at am__quote@
++
++.cpp.o:
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++
++.cpp.obj:
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cpp.lo:
++ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++install-appDATA: $(app_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(appdir)" || $(mkdir_p) "$(DESTDIR)$(appdir)"
++ @list='$(app_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(appDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdir)/$$f'"; \
++ $(appDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdir)/$$f"; \
++ done
++
++uninstall-appDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(app_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(appdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(appdir)/$$f"; \
++ done
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++tags: TAGS
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
++install-binPROGRAMS: install-libLTLIBRARIES
++
++installdirs:
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++#>- clean: clean-am
++#>+ 1
++clean: kde-rpo-clean clean-am
++
++#>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
++#>- clean-libtool mostlyclean-am
++#>+ 2
++clean-am: clean-metasources clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
++ clean-libtool mostlyclean-am
++
++distclean: distclean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++ distclean-libtool distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-appDATA
++
++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-appDATA uninstall-binPROGRAMS \
++ uninstall-info-am uninstall-libLTLIBRARIES
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++ clean-generic clean-libLTLIBRARIES clean-libtool ctags \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-appDATA \
++ install-binPROGRAMS install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-appDATA \
++ uninstall-binPROGRAMS uninstall-info-am \
++ uninstall-libLTLIBRARIES
++
++
++version.h: $(top_srcdir)/umbrello/VERSION
++ printf "#undef UMBRELLO_VERSION\n#define UMBRELLO_VERSION \"`cat $(top_srcdir)/umbrello/VERSION`\"\n" > version.h
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
++#>+ 3
++docbookgenerator.moc: $(srcdir)/docbookgenerator.h
++ $(MOC) $(srcdir)/docbookgenerator.h -o docbookgenerator.moc
++
++#>+ 2
++mocs: docbookgenerator.moc
++
++#>+ 3
++xhtmlgenerator.moc: $(srcdir)/xhtmlgenerator.h
++ $(MOC) $(srcdir)/xhtmlgenerator.h -o xhtmlgenerator.moc
++
++#>+ 2
++mocs: xhtmlgenerator.moc
++
++#>+ 3
++clean-metasources:
++ -rm -f docbookgenerator.moc xhtmlgenerator.moc
++
++#>+ 2
++KDE_DIST=Makefile.in xmi2docbook.sh xhtmlgenerator.h xmi.css xmi2docbook.xsl configure.in.in docbook2xhtml.xsl common.ent Makefile.am
++
++#>+ 2
++docs-am:
++
++#>+ 15
++force-reedit:
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign umbrello/umbrello/docgenerators/Makefile
++ cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
++
++
++#>+ 21
++clean-bcheck:
++ rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-am
++
++bcheck-am:
++ @for i in ; do \
++ if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++ echo "$$i"; \
++ if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ rm -f $$i.bchecktest.cc; exit 1; \
++ fi ; \
++ echo "" >> $$i.bchecktest.cc.class; \
++ perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++ rm -f a.out; \
++ fi ; \
++ done
++
++
++#>+ 11
++libdocgenerators_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/docbookgenerator.cpp $(srcdir)/xhtmlgenerator.cpp xhtmlgenerator.moc docbookgenerator.moc
++ @echo 'creating libdocgenerators_la.all_cpp.cpp ...'; \
++ rm -f libdocgenerators_la.all_cpp.files libdocgenerators_la.all_cpp.final; \
++ echo "#define KDE_USE_FINAL 1" >> libdocgenerators_la.all_cpp.final; \
++ for file in docbookgenerator.cpp xhtmlgenerator.cpp ; do \
++ echo "#include \"$$file\"" >> libdocgenerators_la.all_cpp.files; \
++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdocgenerators_la.all_cpp.final; \
++ done; \
++ cat libdocgenerators_la.all_cpp.final libdocgenerators_la.all_cpp.files > libdocgenerators_la.all_cpp.cpp; \
++ rm -f libdocgenerators_la.all_cpp.final libdocgenerators_la.all_cpp.files
++
++#>+ 3
++clean-final:
++ -rm -f libdocgenerators_la.all_cpp.cpp
++
++#>+ 3
++final:
++ $(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_final_OBJECTS)" all-am
++
++#>+ 3
++final-install:
++ $(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_final_OBJECTS)" install-am
++
++#>+ 3
++no-final:
++ $(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_nofinal_OBJECTS)" all-am
++
++#>+ 3
++no-final-install:
++ $(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_nofinal_OBJECTS)" install-am
++
++#>+ 3
++kde-rpo-clean:
++ -rm -f *.rpo
++
++#>+ 8
++nmcheck:
++docbookgenerator.lo: docbookgenerator.moc
++xhtmlgenerator.lo: xhtmlgenerator.moc
++docbookgenerator.o: docbookgenerator.moc
++nmcheck-am: nmcheck
++$(srcdir)/main.cpp: version.h
++xhtmlgenerator.o: xhtmlgenerator.moc
--- umbrello/umbrello/headings/Makefile.in
+++ umbrello/umbrello/headings/Makefile.in
@@ -104,6 +104,7 @@
@@ -63139,7 +68166,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63149,7 +68189,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63169,7 +68209,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -63188,7 +68228,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -63206,7 +68246,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -382,7 +391,7 @@
+@@ -382,7 +397,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -63215,7 +68255,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -420,9 +429,9 @@
+@@ -420,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63229,7 +68269,57 @@
mostlyclean-libtool:
--- umbrello/umbrello/Makefile.in
+++ umbrello/umbrello/Makefile.in
-@@ -273,6 +273,7 @@
+@@ -77,7 +77,7 @@
+ entityattribute.$(OBJEXT) entitywidget.$(OBJEXT) \
+ enum.$(OBJEXT) enumliteral.$(OBJEXT) enumwidget.$(OBJEXT) \
+ floatingtextwidget.$(OBJEXT) \
+- floatingtextwidgetcontroller.$(OBJEXT) \
++ floatingtextwidgetcontroller.$(OBJEXT) folder.$(OBJEXT) \
+ forkjoinwidget.$(OBJEXT) kplayerslideraction.$(OBJEXT) \
+ hierarchicalcodeblock.$(OBJEXT) import_rose.$(OBJEXT) \
+ infowidget.$(OBJEXT) kstartuplogo.$(OBJEXT) linepath.$(OBJEXT) \
+@@ -106,8 +106,8 @@
+ umlviewcanvas.$(OBJEXT) umlviewimageexporter.$(OBJEXT) \
+ umlviewimageexporterall.$(OBJEXT) \
+ umlviewimageexportermodel.$(OBJEXT) umlwidget.$(OBJEXT) \
+- umlwidgetcontroller.$(OBJEXT) usecase.$(OBJEXT) \
+- usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
++ umlwidgetcontroller.$(OBJEXT) uniqueid.$(OBJEXT) \
++ usecase.$(OBJEXT) usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
+ widget_utils.$(OBJEXT) worktoolbar.$(OBJEXT)
+ #>- umbrello_OBJECTS = $(am_umbrello_OBJECTS)
+ #>+ 56
+@@ -133,7 +133,7 @@
+ entityattribute.$(OBJEXT) entitywidget.$(OBJEXT) \
+ enum.$(OBJEXT) enumliteral.$(OBJEXT) enumwidget.$(OBJEXT) \
+ floatingtextwidget.$(OBJEXT) \
+- floatingtextwidgetcontroller.$(OBJEXT) \
++ floatingtextwidgetcontroller.$(OBJEXT) folder.$(OBJEXT) \
+ forkjoinwidget.$(OBJEXT) kplayerslideraction.$(OBJEXT) \
+ hierarchicalcodeblock.$(OBJEXT) import_rose.$(OBJEXT) \
+ infowidget.$(OBJEXT) kstartuplogo.$(OBJEXT) linepath.$(OBJEXT) \
+@@ -162,8 +162,8 @@
+ umlviewcanvas.$(OBJEXT) umlviewimageexporter.$(OBJEXT) \
+ umlviewimageexporterall.$(OBJEXT) \
+ umlviewimageexportermodel.$(OBJEXT) umlwidget.$(OBJEXT) \
+- umlwidgetcontroller.$(OBJEXT) usecase.$(OBJEXT) \
+- usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
++ umlwidgetcontroller.$(OBJEXT) uniqueid.$(OBJEXT) \
++ usecase.$(OBJEXT) usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
+ widget_utils.$(OBJEXT) worktoolbar.$(OBJEXT)
+ @KDE_USE_FINAL_FALSE at umbrello_OBJECTS = $(umbrello_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at umbrello_OBJECTS = $(umbrello_final_OBJECTS)
+@@ -172,7 +172,8 @@
+ ./codeimport/libcodeimport.la \
+ ./codeimport/kdevcppparser/libkdevcppparser.la \
+ ./clipboard/libclipboard.la ./dialogs/libdialogs.la \
+- ./codegenerators/libcodegenerator.la $(am__DEPENDENCIES_1) \
++ ./codegenerators/libcodegenerator.la \
++ ./docgenerators/libdocgenerators.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+@@ -269,6 +270,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
GMSGFMT = @GMSGFMT@
@@ -63237,7 +68327,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -352,6 +353,9 @@
+@@ -317,6 +319,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -348,6 +356,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63247,7 +68350,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,18 +396,16 @@
+@@ -388,18 +399,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63267,7 +68370,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -424,14 +426,18 @@
+@@ -420,14 +429,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -63286,7 +68389,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -498,14 +504,17 @@
+@@ -494,14 +507,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -63304,8 +68407,37 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -673,7 +682,7 @@
+@@ -570,6 +586,7 @@
+ enumwidget.cpp \
+ floatingtextwidget.cpp \
+ floatingtextwidgetcontroller.cpp \
++folder.cpp \
+ forkjoinwidget.cpp \
+ kplayerslideraction.cpp \
+ hierarchicalcodeblock.cpp \
+@@ -631,6 +648,7 @@
+ umlviewimageexportermodel.cpp \
+ umlwidget.cpp \
+ umlwidgetcontroller.cpp \
++uniqueid.cpp \
+ usecase.cpp \
+ usecasewidget.cpp \
+ widgetbase.cpp \
+@@ -639,10 +657,10 @@
+
+ #umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
+-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
++umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO)
+
+ # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
+-SUBDIRS = codeimport dialogs clipboard pics codegenerators headings refactoring
++SUBDIRS = codeimport dialogs docgenerators clipboard pics codegenerators headings refactoring
+ KDE_ICON = AUTO
+ appdir = $(kde_datadir)/umbrello
+ app_DATA = tips umbrelloui.rc
+@@ -662,7 +680,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -63313,7 +68445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -711,9 +720,9 @@
+@@ -700,9 +718,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63325,7 +68457,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1347,18 +1356,18 @@
+@@ -786,6 +804,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enumwidget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/floatingtextwidget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/floatingtextwidgetcontroller.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folder.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/forkjoinwidget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hierarchicalcodeblock.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/import_rose.Po at am__quote@
+@@ -847,6 +866,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlviewimageexportermodel.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlwidget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlwidgetcontroller.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uniqueid.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usecase.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usecasewidget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widget_utils.Po at am__quote@
+@@ -1329,18 +1349,18 @@
mocs: umlcanvasobject.moc
#>+ 3
@@ -63350,7 +68498,21 @@
#>+ 3
codeoperation.moc: $(srcdir)/codeoperation.h
-@@ -1473,18 +1482,18 @@
+@@ -1406,6 +1426,13 @@
+ mocs: node.moc
+
+ #>+ 3
++folder.moc: $(srcdir)/folder.h
++ $(MOC) $(srcdir)/folder.h -o folder.moc
++
++#>+ 2
++mocs: folder.moc
++
++#>+ 3
+ codeparameter.moc: $(srcdir)/codeparameter.h
+ $(MOC) $(srcdir)/codeparameter.h -o codeparameter.moc
+
+@@ -1455,18 +1482,18 @@
mocs: enum.moc
#>+ 3
@@ -63375,7 +68537,7 @@
#>+ 3
activitywidget.moc: $(srcdir)/activitywidget.h
-@@ -1529,18 +1538,18 @@
+@@ -1511,18 +1538,18 @@
mocs: worktoolbar.moc
#>+ 3
@@ -63400,7 +68562,7 @@
#>+ 3
notewidget.moc: $(srcdir)/notewidget.h
-@@ -1557,18 +1566,18 @@
+@@ -1539,18 +1566,18 @@
mocs: component.moc
#>+ 3
@@ -63425,7 +68587,7 @@
#>+ 3
floatingtextwidget.moc: $(srcdir)/floatingtextwidget.h
-@@ -1578,18 +1587,18 @@
+@@ -1560,18 +1587,18 @@
mocs: floatingtextwidget.moc
#>+ 3
@@ -63450,16 +68612,16 @@
#>+ 3
classifierlistitem.moc: $(srcdir)/classifierlistitem.h
-@@ -1621,66 +1630,66 @@
+@@ -1603,66 +1630,66 @@
#>+ 3
clean-metasources:
- -rm -f codeclassfield.moc hierarchicalcodeblock.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc statewidget.moc codeblock.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc codeclassfielddeclarationblock.moc widgetbase.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc association.moc operation.moc activitywidget.moc docwindow.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc actor.moc package.moc notewidget.moc component.moc codegenerator.moc classifiercodedocument.moc floatingtextwidget.moc umldoc.moc codedocument.moc classifierlistitem.moc umlobject.moc ownedcodeblock.moc umlview.moc
-+ -rm -f codeclassfield.moc hierarchicalcodeblock.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc statewidget.moc codeblock.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc activitywidget.moc docwindow.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc notewidget.moc component.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc codedocument.moc umldoc.moc classifierlistitem.moc umlobject.moc ownedcodeblock.moc umlview.moc
++ -rm -f codeclassfield.moc hierarchicalcodeblock.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc statewidget.moc codeblock.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc folder.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc activitywidget.moc docwindow.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc notewidget.moc component.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc codedocument.moc umldoc.moc classifierlistitem.moc umlobject.moc ownedcodeblock.moc umlview.moc
#>+ 2
--KDE_DIST=classimport.h actorwidget.h umlviewlist.h umllistviewitemlist.h messagewidgetcontroller.h pythonimport.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png codeaccessormethodlist.h umlnamespace.h optionstate.h umlassociationlist.h nativeimportbase.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h adaimport.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h codegenobjectwithtextblocks.h textblock.h cr16-mime-umbrellofile.png listpopupmenu.h hi32-app-umbrello.png umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h association.h idlimport.h hi22-app-umbrello.png cr22-mime-umbrellofile.png datatype.h umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h javaimport.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h cppimport.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h umlviewimageexporter.h pluginloader.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h import_utils.h codeblockwithcomments.h umlpackagelist.h nodewidget.h codedocumentlist.h umltemplatelist.h linkwidget.h floatingtextwidget.h umlobject.h Makefile.am componentwidget.h
-+KDE_DIST=classimport.h actorwidget.h umllistviewitemlist.h umlviewlist.h messagewidgetcontroller.h pythonimport.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png umlnamespace.h codeaccessormethodlist.h optionstate.h umlassociationlist.h nativeimportbase.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h adaimport.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h textblock.h codegenobjectwithtextblocks.h cr16-mime-umbrellofile.png hi32-app-umbrello.png listpopupmenu.h umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h idlimport.h association.h hi22-app-umbrello.png datatype.h cr22-mime-umbrellofile.png umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h javaimport.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h cppimport.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h umlviewimageexporter.h pluginloader.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h import_utils.h codeblockwithcomments.h umlpackagelist.h codedocumentlist.h nodewidget.h umltemplatelist.h linkwidget.h floatingtextwidget.h Makefile.am umlobject.h componentwidget.h
+-KDE_DIST=actorwidget.h umlviewlist.h umllistviewitemlist.h messagewidgetcontroller.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png codeaccessormethodlist.h umlnamespace.h optionstate.h umlassociationlist.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h codegenobjectwithtextblocks.h textblock.h cr16-mime-umbrellofile.png listpopupmenu.h hi32-app-umbrello.png umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h association.h hi22-app-umbrello.png cr22-mime-umbrellofile.png datatype.h umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h pluginloader.h umlviewimageexporter.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h codeblockwithcomments.h umlpackagelist.h nodewidget.h codedocumentlist.h umltemplatelist.h linkwidget.h floatingtextwidget.h umlobject.h Makefile.am componentwidget.h
++KDE_DIST=actorwidget.h umllistviewitemlist.h umlviewlist.h messagewidgetcontroller.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png umlnamespace.h codeaccessormethodlist.h optionstate.h umlassociationlist.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h textblock.h codegenobjectwithtextblocks.h cr16-mime-umbrellofile.png hi32-app-umbrello.png listpopupmenu.h umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h association.h hi22-app-umbrello.png datatype.h cr22-mime-umbrellofile.png umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h folder.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h umlviewimageexporter.h pluginloader.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h uniqueid.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h codeblockwithcomments.h umlpackagelist.h codedocumentlist.h nodewidget.h umltemplatelist.h linkwidget.h floatingtextwidget.h Makefile.am umlobject.h componentwidget.h
#>+ 2
docs-am:
@@ -63555,15 +68717,73 @@
#>+ 15
force-reedit:
-@@ -1721,7 +1730,7 @@
+@@ -1703,11 +1730,11 @@
#>+ 11
--umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/adaimport.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/classimport.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/cppimport.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/idlimport.cpp $(srcdir)/import_rose.cpp $(srcdir)/import_utils.cpp $(srcdir)/infowidget.cpp $(srcdir)/javaimport.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/nativeimportbase.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pythonimport.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc codeclassfielddeclarationblock.moc widgetbase.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc component.moc notewidget.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc codedocument.moc umldoc.moc umlview.moc ownedcodeblock.moc
-+umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/adaimport.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/classimport.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/cppimport.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/idlimport.cpp $(srcdir)/import_rose.cpp $(srcdir)/import_utils.cpp $(srcdir)/infowidget.cpp $(srcdir)/javaimport.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/nativeimportbase.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pythonimport.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc association.moc operation.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc actor.moc package.moc component.moc notewidget.moc codegenerator.moc classifiercodedocument.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc umldoc.moc codedocument.moc umlview.moc ownedcodeblock.moc
+-umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/import_rose.cpp $(srcdir)/infowidget.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/optionstate.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc codeclassfielddeclarationblock.moc widgetbase.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc component.moc notewidget.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc codedocument.moc umldoc.moc umlview.moc ownedcodeblock.moc
++umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/folder.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/import_rose.cpp $(srcdir)/infowidget.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/optionstate.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/uniqueid.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc folder.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc association.moc operation.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc actor.moc package.moc component.moc notewidget.moc codegenerator.moc classifiercodedocument.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc umldoc.moc codedocument.moc umlview.moc ownedcodeblock.moc
@echo 'creating umbrello.all_cpp.cpp ...'; \
rm -f umbrello.all_cpp.files umbrello.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> umbrello.all_cpp.final; \
+- for file in activitywidget.cpp actor.cpp actorwidget.cpp aligntoolbar.cpp artifact.cpp artifactwidget.cpp association.cpp associationwidget.cpp assocrules.cpp attribute.cpp boxwidget.cpp classifier.cpp classifiercodedocument.cpp classifierlistitem.cpp classifierwidget.cpp cmdlineexportallviewsevent.cpp codeaccessormethod.cpp codeblock.cpp codeblockwithcomments.cpp codeclassfield.cpp codeclassfielddeclarationblock.cpp codecomment.cpp codedocument.cpp codegenerationpolicy.cpp codegenerator.cpp codegenobjectwithtextblocks.cpp codemethodblock.cpp codeoperation.cpp codeparameter.cpp component.cpp componentwidget.cpp configurable.cpp datatype.cpp datatypewidget.cpp dialog_utils.cpp docwindow.cpp entity.cpp entityattribute.cpp entitywidget.cpp enum.cpp enumliteral.cpp enumwidget.cpp floatingtextwidget.cpp floatingtextwidgetcontroller.cpp forkjoinwidget.cpp kplayerslideraction.cpp hierarchicalcodeblock.cpp import_rose.cpp infowidget.cpp kstartuplogo.cpp linepath.cpp linkwidget.cpp listpopupmenu.cpp main.cpp messagewidget.cpp messagewidgetcontroller.cpp model_utils.cpp node.cpp nodewidget.cpp notewidget.cpp notewidgetcontroller.cpp objectwidget.cpp objectwidgetcontroller.cpp object_factory.cpp operation.cpp optionstate.cpp ownedcodeblock.cpp ownedhierarchicalcodeblock.cpp package.cpp packagewidget.cpp petalnode.cpp petaltree2uml.cpp plugin.cpp pluginloader.cpp seqlinewidget.cpp statewidget.cpp stereotype.cpp template.cpp textblock.cpp toolbarstate.cpp toolbarstatearrow.cpp toolbarstateassociation.cpp toolbarstatefactory.cpp toolbarstatemessages.cpp toolbarstateother.cpp toolbarstatepool.cpp uml.cpp umlattributelist.cpp umlentityattributelist.cpp umlcanvasobject.cpp umlclassifierlistitemlist.cpp umldoc.cpp umllistview.cpp umllistviewitem.cpp umlnamespace.cpp umlobject.cpp umlobjectlist.cpp umlrole.cpp umlview.cpp umlviewcanvas.cpp umlviewimageexporter.cpp umlviewimageexporterall.cpp umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp widget_utils.cpp worktoolbar.cpp ; do \
++ for file in activitywidget.cpp actor.cpp actorwidget.cpp aligntoolbar.cpp artifact.cpp artifactwidget.cpp association.cpp associationwidget.cpp assocrules.cpp attribute.cpp boxwidget.cpp classifier.cpp classifiercodedocument.cpp classifierlistitem.cpp classifierwidget.cpp cmdlineexportallviewsevent.cpp codeaccessormethod.cpp codeblock.cpp codeblockwithcomments.cpp codeclassfield.cpp codeclassfielddeclarationblock.cpp codecomment.cpp codedocument.cpp codegenerationpolicy.cpp codegenerator.cpp codegenobjectwithtextblocks.cpp codemethodblock.cpp codeoperation.cpp codeparameter.cpp component.cpp componentwidget.cpp configurable.cpp datatype.cpp datatypewidget.cpp dialog_utils.cpp docwindow.cpp entity.cpp entityattribute.cpp entitywidget.cpp enum.cpp enumliteral.cpp enumwidget.cpp floatingtextwidget.cpp floatingtextwidgetcontroller.cpp folder.cpp forkjoinwidget.cpp kplayerslideraction.cpp hierarchicalcodeblock.cpp import_rose.cpp infowidget.cpp kstartuplogo.cpp linepath.cpp linkwidget.cpp listpopupmenu.cpp main.cpp messagewidget.cpp messagewidgetcontroller.cpp model_utils.cpp node.cpp nodewidget.cpp notewidget.cpp notewidgetcontroller.cpp objectwidget.cpp objectwidgetcontroller.cpp object_factory.cpp operation.cpp optionstate.cpp ownedcodeblock.cpp ownedhierarchicalcodeblock.cpp package.cpp packagewidget.cpp petalnode.cpp petaltree2uml.cpp plugin.cpp pluginloader.cpp seqlinewidget.cpp statewidget.cpp stereotype.cpp template.cpp textblock.cpp toolbarstate.cpp toolbarstatearrow.cpp toolbarstateassociation.cpp toolbarstatefactory.cpp toolbarstatemessages.cpp toolbarstateother.cpp toolbarstatepool.cpp uml.cpp umlattributelist.cpp umlentityattributelist.cpp umlcanvasobject.cpp umlclassifierlistitemlist.cpp umldoc.cpp umllistview.cpp umllistviewitem.cpp umlnamespace.cpp umlobject.cpp umlobjectlist.cpp umlrole.cpp umlview.cpp umlviewcanvas.cpp umlviewimageexporter.cpp umlviewimageexporterall.cpp umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp uniqueid.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp widget_utils.cpp worktoolbar.cpp ; do \
+ echo "#include \"$$file\"" >> umbrello.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> umbrello.all_cpp.final; \
+ done; \
+@@ -1738,7 +1765,7 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 217
++#>+ 221
+ $(srcdir)/classifierwidget.cpp: version.h
+ codegenerator.o: codegenerator.moc
+ $(srcdir)/kplayerslideraction.cpp: version.h
+@@ -1760,6 +1787,7 @@
+ nmcheck-am: nmcheck
+ entity.o: entity.moc
+ statewidget.o: statewidget.moc
++folder.lo: folder.moc
+ $(srcdir)/usecasewidget.cpp: version.h
+ $(srcdir)/codemethodblock.cpp: version.h
+ component.o: component.moc
+@@ -1831,6 +1859,7 @@
+ plugin.lo: plugin.moc
+ $(srcdir)/umlviewimageexporter.cpp: version.h
+ $(srcdir)/entitywidget.cpp: version.h
++$(srcdir)/folder.cpp: version.h
+ $(srcdir)/classifiercodedocument.cpp: version.h
+ $(srcdir)/seqlinewidget.cpp: version.h
+ $(srcdir)/artifactwidget.cpp: version.h
+@@ -1880,8 +1909,8 @@
+ $(srcdir)/import_rose.cpp: version.h
+ pluginloader.o: pluginloader.moc
+ objectwidget.lo: objectwidget.moc
+-worktoolbar.lo: worktoolbar.moc
+ $(srcdir)/codeclassfield.cpp: version.h
++worktoolbar.lo: worktoolbar.moc
+ $(srcdir)/enumwidget.cpp: version.h
+ plugin.o: plugin.moc
+ $(srcdir)/notewidgetcontroller.cpp: version.h
+@@ -1892,14 +1921,16 @@
+ $(srcdir)/toolbarstatearrow.cpp: version.h
+ codegenerator.lo: codegenerator.moc
+ $(srcdir)/notewidget.cpp: version.h
+-notewidget.o: notewidget.moc
+ $(srcdir)/codeblockwithcomments.cpp: version.h
++notewidget.o: notewidget.moc
+ $(srcdir)/worktoolbar.cpp: version.h
++$(srcdir)/uniqueid.cpp: version.h
+ $(srcdir)/statewidget.cpp: version.h
+ $(srcdir)/listpopupmenu.cpp: version.h
+ codeblockwithcomments.lo: codeblockwithcomments.moc
+ umlview.lo: umlview.moc
+ $(srcdir)/componentwidget.cpp: version.h
++folder.o: folder.moc
+ codecomment.lo: codecomment.moc
+ $(srcdir)/codegenobjectwithtextblocks.cpp: version.h
+ aligntoolbar.o: aligntoolbar.moc
--- umbrello/umbrello/pics/Makefile.in
+++ umbrello/umbrello/pics/Makefile.in
@@ -104,6 +104,7 @@
@@ -63574,7 +68794,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,9 @@
+@@ -152,6 +153,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -183,6 +190,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63584,7 +68817,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -223,18 +227,16 @@
+@@ -223,18 +233,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63604,7 +68837,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +257,18 @@
+@@ -255,14 +263,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -63623,7 +68856,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +335,17 @@
+@@ -329,14 +341,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -63641,7 +68874,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -474,7 +483,7 @@
+@@ -474,7 +489,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -63650,7 +68883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +521,9 @@
+@@ -512,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63662,7 +68895,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -677,51 +686,51 @@
+@@ -677,51 +692,51 @@
.NOEXPORT:
#>+ 2
@@ -63750,7 +68983,20 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -203,6 +204,9 @@
+@@ -172,6 +173,12 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_DBIV = @LIB_DBIV@
+ LIB_KAB = @LIB_KAB@
+@@ -203,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63760,7 +69006,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -243,18 +247,16 @@
+@@ -243,18 +253,16 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63780,7 +69026,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -275,14 +277,18 @@
+@@ -275,14 +283,18 @@
cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
datadir = @datadir@
@@ -63799,7 +69045,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -349,14 +355,17 @@
+@@ -349,14 +361,17 @@
kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -63817,7 +69063,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -390,7 +399,7 @@
+@@ -390,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -63826,7 +69072,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -428,9 +437,9 @@
+@@ -428,9 +443,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